[portreserve/f18] Use macroized systemd scriptlets (bug #850275).

Tim Waugh twaugh at fedoraproject.org
Tue Aug 21 15:41:56 UTC 2012


commit 82c15f4647a1d3b720df9de76d187eb1ab74e4b6
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 21 15:34:03 2012 +0100

    Use macroized systemd scriptlets (bug #850275).
    
    Resolves: rhbz#850275

 portreserve.spec |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/portreserve.spec b/portreserve.spec
index ce5d316..44f0026 100644
--- a/portreserve.spec
+++ b/portreserve.spec
@@ -1,7 +1,7 @@
 Summary: TCP port reservation utility
 Name: portreserve
 Version: 0.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://cyberelk.net/tim/portreserve/
@@ -50,24 +50,13 @@ EOF
 rm -rf %{buildroot}
 
 %post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post %{name}.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable portreserve.service >/dev/null 2>&1 || :
-    /bin/systemctl stop portreserve.service >/dev/null 2>&1 || :
-fi
+%systemd_preun %{name}.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart portreserve.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart %{name}.service
 
 %triggerun -- portreserve < 0.0.5-3
 # Save the current service runlevel info
@@ -90,6 +79,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Aug 21 2012 Tim Waugh <twaugh at redhat.com> 0.0.5-6
+- Use macroized systemd scriptlets (bug #850275).
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list