[smokeping] Convert to new set of macros for scripts

terjeros terjeros at fedoraproject.org
Tue Aug 28 17:39:39 UTC 2012


commit 37686aec30cc8347411669fa4fcbf15bde55cd6b
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Aug 28 19:39:35 2012 +0200

    Convert to new set of macros for scripts

 smokeping.spec |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/smokeping.spec b/smokeping.spec
index e3ff108..209b753 100644
--- a/smokeping.spec
+++ b/smokeping.spec
@@ -7,7 +7,7 @@
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.6.7
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -99,24 +99,13 @@ mv %{buildroot}%{_bindir}/%{name}_cgi %{buildroot}%{_datadir}/%{name}/cgi
 rm -f %{buildroot}%{_datadir}/%{name}/htdocs/smokeping.fcgi.dist
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post smokeping.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable smokeping.service > /dev/null 2>&1 || :
-    /bin/systemctl stop smokeping.service > /dev/null 2>&1 || :
-fi
+%systemd_preun smokeping.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart smokeping.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart smokeping.service
 
 %triggerun -- smokeping < 2.4.2-13
 # Save the current service runlevel info
@@ -155,6 +144,9 @@ fi
 %{_mandir}/man7/%{name}_*.7*
 
 %changelog
+* Tue Aug 28 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.6.7-4
+- Convert to new set of macros for scripts
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list