From 3b34d64b6fccc521557058e7c95614df619e9c13 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Thu, 26 Apr 2012 08:49:08 -0500
Subject: [PATCH] Review fixes.

---
 mcelog.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/mcelog.spec b/mcelog.spec
index b7ff5bd..a58aba3 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,9 +1,9 @@
 %define	last_git_commit 6e4e2a00
 
-Summary:	Tool to translate x86-64 CPU Machine Check Exception data.
+Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
 Version:	1.0
-Release:	0.4.%{last_git_commit}%{?dist}
+Release:	0.5.%{last_git_commit}%{?dist}
 Epoch:		2
 Group:		System Environment/Base
 License:	GPLv2
@@ -15,6 +15,9 @@ Patch0:		mcelog-fix-trigger-path-and-cacheing.patch
 URL:		https://github.com/andikleen/mcelog.git
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	i686 x86_64
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description
 mcelog is a utility that collects and decodes Machine Check Exception data
@@ -25,7 +28,6 @@ on x86-32 and x86-64 systems. It can be run either as a daemon, or by cron.
 %patch0 -p1 -b .fix-triggers-and-cacheing
 
 %build
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
@@ -33,10 +35,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pie"
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,8}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 install -p -m755 mcelog $RPM_BUILD_ROOT/%{_sbindir}/mcelog
@@ -47,7 +50,7 @@ install -p -m755 triggers/dimm-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcel
 install -p -m755 triggers/page-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/page-error-trigger
 install -p -m755 triggers/socket-memory-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/socket-memory-error-trigger
 install -p -m755 mcelog.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/mcelog.cron
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/mcelog.service
+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
 install -p -m644 mcelog.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
 %clean
@@ -79,10 +82,13 @@ fi
 %config(noreplace) %{_sysconfdir}/mcelog/mcelog.conf
 %{_sysconfdir}/mcelog/mcelog.setup
 %{_sysconfdir}/cron.hourly/mcelog.cron
-/lib/systemd/system/mcelog.service
+%{_unitdir}/mcelog.service
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Thu Apr 26 2012 Jon Ciesla <limburgher@gmail.com> - 2:1.0-0.5.6e4e2a00
+- Merge review fixes, BZ 226132.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.0-0.4.6e4e2a00
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild