[rpld] Fix 850299

[Paul Komkoff]

commit 1b319caf08d4ea9b9a0956d2d6c22803a35b46b0
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sun Sep 1 17:19:49 2013 +0400

    Fix 850299

 rpld.init |   72 ---------------------------------------------------------
 rpld.spec |   76 +++++++++----------------------------------------------------
 2 files changed, 11 insertions(+), 137 deletions(-)
---
diff --git a/rpld.spec b/rpld.spec
index 1f43103..3449dfb 100644
--- a/rpld.spec
+++ b/rpld.spec
@@ -1,6 +1,6 @@
 Name:           rpld
 Version:        1.8
-Release:        0.17.beta1%{?dist}
+Release:        0.18.beta1%{?dist}
 Summary:        RPL/RIPL remote boot daemon
 Group:          System Environment/Daemons
 # No version specified.
@@ -14,73 +14,23 @@ Patch0:         rpld_1.8beta1-6.diff.gz
 Patch1:         rpld-1.8-makefile.patch
 
 BuildRequires:  byacc flex
-%if 0%{?fedora} >= 16
-BuildRequires: systemd-units
-Requires(post): systemd-units systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
-Requires(post): initscripts chkconfig
-Requires(preun): initscripts chkconfig
-Requires(postun): initscripts
-%endif
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 Daemon to net-boot IBM style RPL boot ROMs (this is not the
 same as the Novell IPX-style RPL protocol, despite the
 name).
 
-%if 0%{?fedora} >= 16
-%package sysvinit
-Summary: SysV init script for %{name}.
-
-%description sysvinit
-SysV init script for %{name}.
-
-%triggerpostun -n %{name}-sysvinit -- %{name} < 1.8-0.12.beta1
-/sbin/chkconfig --add httpd >/dev/null 2>&1 || :
-
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    echo foo1
-fi
+%systemd_post rpld.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
+%systemd_preun rpld.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- %{name} < 1.8-0.12.beta1
-/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
-/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
-/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-
-%else
-%post
-/sbin/chkconfig --add %{name}
-
-%preun
-if [ $1 = 0 ]; then
-        /sbin/service %{name} stop >/dev/null 2>&1
-	/sbin/chkconfig --del %{name}
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-        /sbin/service %{name} condrestart >/dev/null 2>&1 || :
-fi
-%endif
+%systemd_postun rpld.service
 
 %prep
 %setup -q
@@ -105,14 +55,10 @@ make install DESTDIR=$RPM_BUILD_ROOT BINMODE=755 MANMODE=644
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-install -d $RPM_BUILD_ROOT%{_initrddir}
-install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fedora} >= 16
 install -d $RPM_BUILD_ROOT%{_unitdir}
 install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-%endif
 
 %files
 %defattr(-,root,root,-)
@@ -120,13 +66,13 @@ install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
 %{_sbindir}/*
 %{_mandir}/man[^3]/*
 %{_sysconfdir}/sysconfig/%{name}
-%if 0%{?fedora} >= 16
 %{_unitdir}/%{name}.service
-%files sysvinit
-%endif
-%{_initrddir}/%{name}
 
 %changelog
+* Sun Sep 01 2013 i at stingr.net - 1.8-0.18.beta1
+- bz#850299
+- get rid of compatibility ifs
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-0.17.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild