[gvrpcd] Migrate to systemd.

[Jon Ciesla]

commit 879d6495228f4330d13f48e58747d738b9370a9f
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Feb 15 13:09:36 2012 -0600

    Migrate to systemd.

 gvrpcd.service |    9 +++++++++
 gvrpcd.spec    |   54 ++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 10 deletions(-)
---
diff --git a/gvrpcd.service b/gvrpcd.service
new file mode 100644
index 0000000..223baf0
--- /dev/null
+++ b/gvrpcd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gvrpcd GVRP VLANs Announcing Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/gvrpcd -i eth0 -t 3
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gvrpcd.spec b/gvrpcd.spec
index c929a38..f6a550e 100644
--- a/gvrpcd.spec
+++ b/gvrpcd.spec
@@ -1,21 +1,25 @@
 Name:           gvrpcd
 Version:        1.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A program for announcing VLANs using GVRP
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/
 Source0:        http://sokrates.mimuw.edu.pl/~sebek/%{name}/%{name}-%{version}.tar.gz
+Source1:        gvrpcd.service
 Patch0:         gvrpcd-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libnet-devel
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
+#Requires(post): /sbin/chkconfig
+#Requires(preun): /sbin/chkconfig
 # This is for /sbin/service
-Requires(preun): /sbin/service
+#Requires(preun): /sbin/service
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 
 %description
@@ -27,13 +31,30 @@ wants to be able to connect to.
 
 %post
 # This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add gvrpcd
+#/sbin/chkconfig --add gvrpcd
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 
 %preun
-if [ $1 = 0 ] ; then
-    /sbin/service gvrpcd stop >/dev/null 2>&1
-    /sbin/chkconfig --del gvrpcd
+#if [ $1 = 0 ] ; then
+#    /sbin/service gvrpcd stop >/dev/null 2>&1
+#    /sbin/chkconfig --del gvrpcd
+#fi
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable gvrpcd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop gvrpcd.service > /dev/null 2>&1 || :
+fi
+
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart gvrpcd.service >/dev/null 2>&1 || :
 fi
 
 
@@ -48,23 +69,36 @@ make %{?_smp_mflags} CFLAGS="%{optflags}"
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D -m0755 gvrpcd $RPM_BUILD_ROOT%{_sbindir}/gvrpcd
-install -p -D -m0755 gvrpcd-fedora.init $RPM_BUILD_ROOT%{_initrddir}/gvrpcd
+install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/gvrpcd.service
 install -p -D -m0644 gvrpcd-fedora.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gvrpcd
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerun -- gvrpcd < 1.3-6
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save gvrpcd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del gvrpcd >/dev/null 2>&1 || :
+/bin/systemctl try-restart gvrpcd.service >/dev/null 2>&1 || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_sbindir}/gvrpcd
-%{_initrddir}/gvrpcd
+%{_unitdir}/gvrpcd.service
 %config(noreplace) %{_sysconfdir}/sysconfig/gvrpcd
 
 
 %changelog
+* Wed Feb 15 2012 Jon Ciesla <limburgher at gmail.com> - 1.3-6
+- Migrate to systemd, BZ 781483.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild