[cronie/f18] Scriptlets replaced with new systemd macros (#850070).

Marcela Mašláňová mmaslano at fedoraproject.org
Thu Sep 6 14:36:06 UTC 2012


commit 63e2d5338cf419d0e83ecee3049ffc74d54ede4d
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Thu Sep 6 12:00:39 2012 +0200

    Scriptlets replaced with new systemd macros (#850070).
    
    Signed-off-by: Marcela Mašláňová <mmaslano at redhat.com>

 cronie.spec |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/cronie.spec b/cronie.spec
index 1134c9c..e7985b4 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -6,7 +6,7 @@
 Summary:   Cron daemon for executing programs at set times
 Name:      cronie
 Version:   1.4.8
-Release:   12%{?dist}
+Release:   13%{?dist}
 License:   MIT and BSD and ISC and GPLv2
 Group:     System Environment/Base
 URL:       https://fedorahosted.org/cronie
@@ -141,11 +141,7 @@ install -m 755 cronie.init $RPM_BUILD_ROOT%{_initrddir}/crond
 
 %post
 # run after an installation
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    /bin/systemctl enable crond.service >/dev/null 2>&1 || :
-fi
+%systemd_post crond.service
 
 %post anacron
 [ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily
@@ -154,17 +150,11 @@ fi
 
 %preun
 # run before a package is removed
-if [ $1 -eq 0 ]; then
-    /bin/systemctl --no-reload disable crond.service >/dev/null 2>&1 || :
-    /bin/systemctl stop crond.service > /dev/null 2>&1 || :
-fi
+%systemd_preun crond.service
 
 %postun
 # run after a package is removed
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
-    /bin/systemctl try-restart crond.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart crond.service
 
 %triggerun -- cronie-anacron < 1.4.1
 # empty /etc/crontab in case there are only old regular jobs
@@ -232,6 +222,9 @@ exit 0
 %attr(0755,root,root) %{_initrddir}/crond
 
 %changelog
+* Wed Sep 05 2012 Václav Pavlín <vpavlin at redhat.com> - 1.4.8-13
+- Scriptlets replaced with new systemd macros (#850070)
+
 * Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.8-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list