[bip/f18] - Scriptlets replaced with new systemd macros (#850046)

Brian C. Lane bcl at fedoraproject.org
Thu Dec 19 18:12:23 UTC 2013


commit d02619e1c3a37898b42b44d29b2e221d7f8b000f
Author: Brian C. Lane <bcl at redhat.com>
Date:   Thu Dec 19 09:02:01 2013 -0800

    - Scriptlets replaced with new systemd macros (#850046)

 bip.spec |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/bip.spec b/bip.spec
index f974f91..6f20c79 100644
--- a/bip.spec
+++ b/bip.spec
@@ -1,6 +1,6 @@
 Name:    bip
 Version: 0.8.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
 License: GPLv2+
@@ -84,25 +84,14 @@ rm -rf $RPM_BUILD_ROOT
   -s /bin/sh -r -d / bip 2> /dev/null || :
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post bip.service
 /bin/systemd-tmpfiles --create %{_sysconfdir}/tmpfiles.d/bip.conf
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable bip.service > /dev/null 2>&1 || :
-    /bin/systemctl stop bip.service > /dev/null 2>&1 || :
-fi
+%systemd_preun bip.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart bip.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart bip.service
 
 %triggerun -- bip < 0.8.8-2
 /usr/bin/systemd-sysv-convert --save bip >/dev/null 2>&1 ||:
@@ -126,6 +115,9 @@ fi
 %{_unitdir}/bip.service
 
 %changelog
+* Wed Dec 18 2013 Brian C. Lane <bcl at redhat.com> 0.8.9-2
+- Scriptlets replaced with new systemd macros (#850046)
+
 * Sat Nov 09 2013 Brian C. Lane <bcl at redhat.com> 0.8.9-1
 - Upstream v0.8.9
 - CVE-2013-4550 - failed SSL handshake resource leak


More information about the scm-commits mailing list