[Pound/f18] update systemd macros

Tom Callaway spot at fedoraproject.org
Sun Aug 19 22:37:55 UTC 2012


commit f7e20e2f40d3f9d92b261e80e8015209a0954edf
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Sun Aug 19 17:38:37 2012 -0500

    update systemd macros

 Pound.spec |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/Pound.spec b/Pound.spec
index 589871e..7c93ef8 100644
--- a/Pound.spec
+++ b/Pound.spec
@@ -4,7 +4,7 @@
 
 Name:        Pound
 Version:     2.6
-Release:     4%{?dist}
+Release:     5%{?dist}
 Summary:     Reverse proxy and load balancer
 Group:       System Environment/Daemons
 License:     GPLv3
@@ -64,10 +64,7 @@ id %{pound_user} >/dev/null 2>&1 || \
     -c "Pound user" %{pound_user}
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post pound.service
 # generate dummy certificate
 exec > /dev/null 2> /dev/null
 if [ ! -f %{_sysconfdir}/pki/tls/certs/pound.pem ] ; then
@@ -89,18 +86,10 @@ fi
 exit 0
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable pound.service > /dev/null 2>&1 || :
-    /bin/systemctl stop pound.service > /dev/null 2>&1 || :
-fi
+%systemd_preun pound.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart pound.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart pound.service
 
 %triggerun -- pound < 2.6-0.2.c
 # Save the current service runlevel info
@@ -124,6 +113,9 @@ fi
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Sun Aug 19 2012 Tom Callaway <spot at fedoraproject.org> - 2.6-5
+- update scriptlets to use new systemd macros
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list