[sipwitch] sipwitch-1.1.1 add BR: qt4-devel add -gui subpkg

nucleo nucleo at fedoraproject.org
Fri Sep 2 13:05:09 UTC 2011


commit 534612fdd6c9c39635b2aa5cb82e0f49a11fbc66
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Sep 2 16:04:47 2011 +0300

    sipwitch-1.1.1
    add BR: qt4-devel
    add -gui subpkg

 .gitignore    |    1 +
 sipwitch.spec |   43 +++++++++++++++++++++++++++----------------
 sources       |    2 +-
 3 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4c7abf..b83beef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ sipwitch-0.9.0.tar.gz
 /sipwitch-0.10.3.tar.gz
 /sipwitch-1.0.1.tar.gz
 /sipwitch-1.0.3.tar.gz
+/sipwitch-1.1.1.tar.gz
diff --git a/sipwitch.spec b/sipwitch.spec
index 9631610..e56d792 100644
--- a/sipwitch.spec
+++ b/sipwitch.spec
@@ -10,8 +10,8 @@
 
 Name: sipwitch
 Summary: A secure peer-to-peer VoIP server for the SIP protocol
-Version: 1.0.3
-Release: 0%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
 Group: Applications/Communications
@@ -21,7 +21,7 @@ BuildRequires: ucommon-devel >= 5.0.0
 BuildRequires: libeXosip2-devel >= 3.0.0
 BuildRequires: avahi-devel
 BuildRequires: openssl-devel
-# BuildRequires: libnotify-devel
+BuildRequires: qt4-devel
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -33,7 +33,7 @@ Group: Development/Libraries
 Summary: Runtime library support for sipwitch
 
 %package devel
-Requires: ucommon-devel >= 4.0.2
+Requires: ucommon-devel >= 5.0.0
 Requires: %{name}-runtime = %{version}-%{release}
 Group: Development/Libraries
 Summary: Headers for building sipwitch plugins
@@ -47,10 +47,6 @@ Summary: cgi web interface to control sipwitch server
 Requires: %{name} = %{version}-%{release}
 Summary: Zeroconf plugin for sipwitch
 
-# %package plugin-libnotify
-# Requires: %{name} = %{version}-%{release}
-# Summary: libnotify plugin for sipwitch
-
 %package plugin-scripting
 Requires: %{name} = %{version}-%{release}
 Summary: Scripting plugin for sipwitch
@@ -63,6 +59,10 @@ Summary: Forward registration and routing plugin
 Requires: %{name} = %{version}-%{release}
 Summary: Subscriber gateway plugin for sipwitch
 
+%package gui
+Summary: user agent to monitor running sipwitch process
+Requires: sipwitch
+
 %description
 GNU SIP Witch is a secure peer-to-peer VoIP server.  Calls can be made even
 behind NAT firewalls, and without needing a service provider.  SIP Witch can
@@ -90,10 +90,6 @@ server using the cgi interface of an installed web server.  The primary
 service this offers is xmlrpc access to sipwitch shared memory and
 control interfaces in a manner analgolous to the sipwitch command utility.
 
-# %description plugin-libnotify
-# This plugin sends notification events to the desktop using the libnotify
-# library.
-
 %description plugin-zeroconf
 This plugin activates zeroconf network services for sipwitch and publishes
 sipwitch as a sip server.
@@ -117,9 +113,15 @@ this would be deployed in an isp supplied premise router to enable a
 local user to subscribe a series of local softphone/sip devices with a
 remote voip service provider.
 
+%description gui
+This package offers the switchview user agent to monitor the activity of
+your locally installed sipwitch service.
+
 %prep
 %setup -q
+
 %build
+export UIC=%{_bindir}/uic-qt4 MOC=%{_bindir}/moc-qt4
 %configure --with-pkg-config --disable-static --with-initrddir=%{_initrddir}
 
 %{__make} %{?_smp_mflags}
@@ -163,10 +165,6 @@ echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
-# %files plugin-libnotify
-# %defattr(-,root,root,-)
-# %{_libdir}/sipwitch/notify.so
-
 %files plugin-zeroconf
 %defattr(-,root,root,-)
 %{_libdir}/sipwitch/zeroconf.so
@@ -191,6 +189,14 @@ echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
 %{_bindir}/sipwitch-config
 %{_mandir}/man1/sipwitch-config.*
 
+%files gui
+%defattr(-,root,root,0755)
+%{_bindir}/switchview
+/etc/xdg/autostart/switchview-autostart.desktop
+%{_datadir}/applications/switchview.desktop
+%{_datadir}/pixmaps/switchview.png
+%{_mandir}/man1/switchview.1*
+
 %post runtime
 /sbin/ldconfig
 
@@ -212,6 +218,11 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Fri Sep  2 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.1.1-1
+- sipwitch-1.1.1
+- add BR: qt4-devel
+- add -gui subpkg
+
 * Wed Jun 29 2011 David Sugar <dyfet at gnutelephony.org> - 1.0.3-0
 - fixed init script issue, per bug #712546
 - new internal redirection api simplifies plugin linking
diff --git a/sources b/sources
index e1bb4df..016fdc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23f9a49774972e7663624da2cedd9f51  sipwitch-1.0.3.tar.gz
+35fa1a900abfb381dad618dae5bf099e  sipwitch-1.1.1.tar.gz


More information about the scm-commits mailing list