[and/f17] Revert "Use of systemd macros instead of scriptlets"

Jochen Schmitt s4504kr at fedoraproject.org
Fri Oct 5 17:16:35 UTC 2012


commit 4f4eaf2daf971289d074d40fb6ef2356db0736ba
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Fri Oct 5 19:15:26 2012 +0200

    Revert "Use of systemd macros instead of scriptlets"
    
    This reverts commit 52e436aaa10fb66f6fa3eca14440b35832d5b8b4.

 and.spec |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/and.spec b/and.spec
index cd64f45..e5223b6 100644
--- a/and.spec
+++ b/and.spec
@@ -12,6 +12,8 @@ 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}
 
@@ -30,6 +32,9 @@ 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
@@ -49,6 +54,7 @@ make %{?_smp_mflags} \
      INSTALL_MAN=%{_mandir}
 
 %install
+rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -64,14 +70,24 @@ 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
-%systemd_post and.service 
+if [ $1 -eq 1 ]; then
+   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
-%systemd_preun and.service
+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
 
 %postun
-%systemd_postun_with_restart and.service
+if [ $0 -ne 0 ]; then
+   /bin/systemctl try-restart and.service >/dev/null 2>&1 || :
+fi
 
 %files
 %defattr(-,root,root)
@@ -84,9 +100,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
 %{_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