From 6b83ec28104cc2a3cc8ba5a11c5b4004318cfc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 26 Jan 2016 21:10:39 -0500
Subject: [PATCH] Clean up systemd stuff

---
 mcelog.service |  2 --
 mcelog.spec    | 24 ++++++------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/mcelog.service b/mcelog.service
index 62d8cbe..1148239 100644
--- a/mcelog.service
+++ b/mcelog.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Machine Check Exception Logging Daemon
-After=syslog.target
 
 # FIXME - due to upstream kernel bug always start the mcelog process
 # twice using the following ExecStartPre hack. This needs fixing.
@@ -11,7 +10,6 @@ After=syslog.target
 [Service]
 ExecStartPre=/etc/mcelog/mcelog.setup
 ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
-StandardOutput=syslog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mcelog.spec b/mcelog.spec
index 0e71a25..d126a7b 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -14,9 +14,9 @@ Source1:	mcelog.conf
 Source2:	mcelog.service
 Source10:	mcelog.setup
 ExclusiveArch:	i686 x86_64
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 BuildRequires: systemd
 
 %description
@@ -46,28 +46,16 @@ install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
 install -p -m644 mcelog*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-systemctl enable mcelog.service &> /dev/null ||
-systemctl daemon-reload &> /dev/null
+%systemd_post mcelog.service
 
 %preun
-# Handle removing mcelog
-if [ "$1" -eq 0 ]; then
-	systemctl disable mcelog.service &> /dev/null
-	systemctl stop mcelog.service &> /dev/null
-fi
+%systemd_preun mcelog.service
 
 %postun
-# Handle upgrading mcelog
-if [ "$1" -ge 1 ]; then
-	systemctl try-restart mcelog.service &> /dev/null
-fi
+%systemd_postun_with_restart mcelog.service
 
 %files
-%defattr(-,root,root,-)
 %doc README CHANGES
 %{_sbindir}/mcelog
 %dir %{_sysconfdir}/mcelog