[foghorn/f19] Use new systemd-rpm macros.

rohara rohara at fedoraproject.org
Wed Mar 20 14:29:30 UTC 2013


commit 620f8b13b550913c4fc52007b816481141ca7866
Author: Ryan O'Hara <rohara at redhat.com>
Date:   Wed Mar 20 09:28:40 2013 -0500

    Use new systemd-rpm macros.

 foghorn.spec |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/foghorn.spec b/foghorn.spec
index 8402e87..7358d7c 100644
--- a/foghorn.spec
+++ b/foghorn.spec
@@ -5,7 +5,7 @@
 
 Name: foghorn
 Version: 0.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: D-Bus to SNMP service.
 Group: System Environment/Base
 License: GPLv2+
@@ -43,21 +43,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ $1 -eq 1 ] ; then 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post foghorn.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    /bin/systemctl --no-reload disable foghorn.service > /dev/null 2>&1 || :
-    /bin/systemctl stop foghorn.service > /dev/null 2>&1 || :
-fi
+%systemd_preun foghorn.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    /bin/systemctl try-restart foghorn.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart foghorn.service
 
 %triggerun -- foghorn < 0.1.5-2
 /usr/bin/systemd-sysv-convert --save foghorn >/dev/null 2>&1 ||:
@@ -77,6 +69,10 @@ fi
 %{_sbindir}/foghorn
 
 %changelog
+* Wed Mar 20 2013 Ryan O'Hara <rohara at redhat.com> - 0.1.6-5
+- Use new systemd-rpm macros in foghorn spec file.
+- Resolves: rhbz#850116
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list