[and] Introduction of rpm systemd macros
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Oct 5 17:41:21 UTC 2012
commit 71ca98087cb9c59fbf9f1ec3b576e8334dec3492
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Oct 5 19:41:13 2012 +0200
Introduction of rpm systemd macros
- Clean up of the SPEC file
and.spec | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/and.spec b/and.spec
index e5eaf73..935b060 100644
--- a/and.spec
+++ b/and.spec
@@ -1,6 +1,6 @@
Name: and
Version: 1.2.2
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Auto nice daemon
License: GPLv2
@@ -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}
@@ -54,7 +52,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 +67,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 +87,10 @@ fi
%{_unitdir}/and.service
%changelog
+* Fri Oct 5 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1.2.2-18
+- Introduction of rpm systemd macros
+- Clean up of the SPEC file
+
* 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