From 67e5c58cc61fc328c992711687a6fecee345ee07 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Tue, 28 Aug 2012 17:28:35 +0200
Subject: [PATCH 1/2] Fix misprint operator in %post stanza (#852419)

---
 and.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/and.spec b/and.spec
index 8eb737b..e5eaf73 100644
--- a/and.spec
+++ b/and.spec
@@ -1,6 +1,6 @@
 Name:      and
 Version:   1.2.2
-Release:   16%{?dist}
+Release:   17%{?dist}
 Summary:   Auto nice daemon
 
 License:   GPLv2
@@ -85,7 +85,7 @@ if [ $1 -eq 1 ]; then
 fi
 
 %postun
-if [ $0 -en 0 ]; then
+if [ $0 -ne 0 ]; then
    /bin/systemctl try-restart and.service >/dev/null 2>&1 || :
 fi
 
@@ -100,6 +100,9 @@ fi
 %{_unitdir}/and.service
 
 %changelog
+* Tue Aug 28 2012 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-17
+- Fix misprint operator in %%post stanza (#852419)
+
 * Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 25cfdb7ea12646426e6b2f6f7a21f2d5285de8f4 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Fri, 5 Oct 2012 19:41:13 +0200
Subject: [PATCH 2/2] Introduction of rpm systemd macros

- Clean up of the SPEC file
---
 and.spec | 25 ++++++++-----------------
 1 file 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)