[sipwitch] new upstream rel, systemd migration, gui removed

[David Sugar]

commit 6f89a2f370e0bf6a6d70423d320205cc65159e93
Author: David Sugar <dyfet at gnutelephony.org>
Date:   Mon Aug 12 11:38:08 2013 -0400

    new upstream rel, systemd migration, gui removed
    
    In upstream sipwitch-gui is now a separate package, "switchview",
    and this depends on another package, coastal-qt.  Both of these
    will be separately packaged later in Fedora.  As a result, the
    sipwitch srpm now only builds the server, runtime, and plugins.
    
    In addition, we completed systemd migration (finally).  This is
    the first sipwitch release in fedora which is migrated.

 .gitignore    |    1 +
 sipwitch.spec |   57 +++++++++++++++++++--------------------------------------
 sources       |    2 +-
 3 files changed, 21 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6accb4b..0a347d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ sipwitch-0.9.0.tar.gz
 /sipwitch-1.3.1.tar.gz
 /sipwitch-1.3.2.tar.gz
 /sipwitch-1.4.0.tar.gz
+/sipwitch-1.6.1.tar.gz
diff --git a/sipwitch.spec b/sipwitch.spec
index 6174a76..458dbab 100644
--- a/sipwitch.spec
+++ b/sipwitch.spec
@@ -12,22 +12,20 @@
 
 Name: sipwitch
 Summary: A secure peer-to-peer VoIP server for the SIP protocol
-Version: 1.4.0
-Release: 4%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
 Group: Applications/Communications
-Source: http://www.gnutelephony.org/dist/tarballs/sipwitch-%{version}.tar.gz
+Source: http://dev.gnutelephony.org/dist/tarballs/sipwitch-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ucommon-devel >= 6.0.0
 BuildRequires: libeXosip2-devel >= 3.0.0
 BuildRequires: avahi-devel
 BuildRequires: openssl-devel
-BuildRequires: qt4-devel
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 Requires: %{name}-runtime = %{version}-%{release}
 
 %package runtime
@@ -61,10 +59,6 @@ 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
@@ -115,16 +109,11 @@ 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}
+%configure --with-pkg-config --disable-static --with-initrddir=none
 
 %{__make} %{?_smp_mflags}
 
@@ -151,7 +140,7 @@ echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
 %attr(04755,root,root) %{_bindir}/sippasswd
 %dir %{_libdir}/sipwitch
 %config(noreplace) %{_sysconfdir}/logrotate.d/sipwitch
-%attr(0755,root,root) %{_initrddir}/sipwitch
+%attr(0755,root,root) %{_libdir}/systemd/system/sipwitch.service
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/sipwitch
 %attr(0770,root,root) %dir %{_sysconfdir}/sipwitch.d
 %attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.conf
@@ -192,35 +181,27 @@ 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
 
+%postun runtime
+/sbin/ldconfig
+
 %post
-/sbin/chkconfig --add sipwitch
+%systemd_post sipwitch.service
 
 %preun
-if [ $1 = 0 ] ; then
-    /sbin/service sipwitch stop >/dev/null 2>&1
-    /sbin/chkconfig --del sipwitch
-fi
+%systemd_preun sipwitch.service
 
 %postun
-if [ "$1" -ge "1" ] ; then
-    /sbin/service sipwitch condrestart >/dev/null 2>&1 || :
-fi
-
-%postun runtime
-/sbin/ldconfig
+%systemd_postun_with_restart sipwitch.service
 
 %changelog
+* Mon Aug 12 2013 David Sugar <dyfet at gnutelephony.org> - 1.6.1-1
+- migrated to systemd support (finally!)
+- removed sipwitch-gui subpackage; now separated into switchview pkg.
+- latest upstream 1.6.1
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c3ee02d..870dba3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de8e8244d09fbd38d4dbed0a1ee7748c  sipwitch-1.4.0.tar.gz
+33710f14cfb39bd1daff1612f35adc86  sipwitch-1.6.1.tar.gz