[arptables_jf/f18] use new systemd-rpm macros (#850031)

Jiří Popelka jpopelka at fedoraproject.org
Wed Aug 22 13:00:09 UTC 2012


commit f8bad83ae5bcaf33a36a8216072361853379a0e8
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 22 14:59:22 2012 +0200

    use new systemd-rpm macros (#850031)

 arptables_jf.spec |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/arptables_jf.spec b/arptables_jf.spec
index 28c70c1..2aa1754 100644
--- a/arptables_jf.spec
+++ b/arptables_jf.spec
@@ -3,7 +3,7 @@ Summary: User-space control program for the arptables network filter
 Name:    arptables_jf
 
 Version: 0.0.8
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 
@@ -62,24 +62,14 @@ echo '#Configure prior to use' > %{buildroot}%{_sysconfdir}/sysconfig/arptables
 
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post arptables.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable arptables.service > /dev/null 2>&1 || :
-    /bin/systemctl stop arptables.service > /dev/null 2>&1 || :
-fi
+%systemd_preun arptables.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart arptables.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart arptables.service
+
 
 %triggerun -- arptables_jf < 0.0.8-25
 # Save the current service runlevel info
@@ -100,6 +90,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/arptables
 
 %changelog
+* Wed Aug 22 2012 Jiri Popelka <jpopelka at redhat.com> - 0.0.8-29
+- use new systemd-rpm macros (#850031)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list