[milter-greylist] use macros for systemd stuff
ensc
ensc at fedoraproject.org
Wed Jan 4 14:05:36 UTC 2012
commit 4e1e43ec8d4cf4b638fb5bbda06543235caf2b23
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Wed Jan 4 14:43:42 2012 +0100
use macros for systemd stuff
milter-greylist.spec | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/milter-greylist.spec b/milter-greylist.spec
index 355e483..020c6df 100644
--- a/milter-greylist.spec
+++ b/milter-greylist.spec
@@ -24,6 +24,22 @@
%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \
%nil}
+%{!?systemd_reqs:%global systemd_reqs \
+Requires(post): /bin/systemctl\
+Requires(preun): /bin/systemctl\
+Requires(postun): /bin/systemctl\
+%nil}
+%{!?systemd_install:%global systemd_install()\
+%post %1\
+test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\
+%preun %1\
+test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\
+test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\
+%postun %1\
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :\
+test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\
+%nil}
+
Summary: Milter for greylisting, the next step in the spam control war
Name: milter-greylist
@@ -86,9 +102,7 @@ Summary: Systemd initscripts for %name
Group: System Environment/Daemons
Provides: init(%name) = systemd
Source20: %name.systemd.service
-Requires(post): /bin/systemctl
-Requires(preun): /bin/systemctl
-Requires(postun): /bin/systemctl
+%{?systemd_reqs}
%{?noarch}
# Remove me after F17
@@ -243,16 +257,7 @@ test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || :
test "$1" != "0" || /sbin/initctl -q stop milter-greylist || :
-%post systemd
-test "$1" -ne 1 || /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
-%preun systemd
-test "$1" -ne 1 || /bin/systemctl disable %name.service > /dev/null 2>&1 || :
-test "$1" -ne 1 || /bin/systemctl stop %name.service > /dev/null 2>&1 || :
-
-%postun systemd
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null 2>&1 || :
+%systemd_install systemd %name.service
%clean
More information about the scm-commits
mailing list