[and/f17] Use of systemd macros instead of scriptlets
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Oct 5 17:14:51 UTC 2012
commit 52e436aaa10fb66f6fa3eca14440b35832d5b8b4
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Oct 5 19:14:41 2012 +0200
Use of systemd macros instead of scriptlets
and.spec | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/and.spec b/and.spec
index e5223b6..cd64f45 100644
--- a/and.spec
+++ b/and.spec
@@ -12,8 +12,6 @@ Source1: and.sysconf
Source2: and.service
Patch1: and-1.2.2-makefile.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-
Obsoletes: and-sysvinit < %{version}-%{release}
Provides: and-sysvinit = %{version}-%{release}
@@ -32,9 +30,6 @@ Obsoletes: and-sysvinit < 1.2.2-11
provides: and-units = %{version}-%{release}
Obsoletes: and-units < 1.2.2-11
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-
%description
The auto nice daemon renices and even kills jobs according to their CPU time,
owner, and command name. This is especially useful on production machines with
@@ -54,7 +49,6 @@ make %{?_smp_mflags} \
INSTALL_MAN=%{_mandir}
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_mandir}/man8
@@ -70,24 +64,14 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/and
mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
-%clean
-rm -rf %{buildroot}
-
%post
-if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post and.service
%preun
-if [ $1 -eq 1 ]; then
- /bin/systemctl --no-reload disable and.service >/dev/null 2>&1 || :
- /bin/systemctl stop and.service >/dev/null 2>&1 || :
-fi
+%systemd_preun and.service
%postun
-if [ $0 -ne 0 ]; then
- /bin/systemctl try-restart and.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart and.service
%files
%defattr(-,root,root)
@@ -100,6 +84,9 @@ fi
%{_unitdir}/and.service
%changelog
+* Fri Oct 5 2012 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-17
+- Use of systemd macros instead of scriptlets
+
* Tue Aug 28 2012 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-17
- Fix misprint operator in %%post stanza (#852419)
More information about the scm-commits
mailing list