[olpc-powerd] Update systemd scripts to latest distro specs (RHBZ 1094920)

[Peter Robinson]

commit 9de5e2656e6e1159593c64bcc7bf30f636f97277
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun May 11 12:47:32 2014 +0100

    Update systemd scripts to latest distro specs (RHBZ 1094920)

 olpc-powerd.spec |   55 ++++++++++++++++++++++-------------------------------
 1 files changed, 23 insertions(+), 32 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 9d794ee..bbd5fb1 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,19 +1,22 @@
 %define tag f5cea82
 
+Name:    olpc-powerd
 Summary: OLPC XO power management
-Name: olpc-powerd
 Version: 110
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
-Group: System Environment/Base
+Group:   System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
 
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/powerd
 Source0: %{name}-%{version}-git%{tag}.tar.gz
 
-BuildRequires: kernel-headers, NetworkManager-glib-devel, libusb1-devel
-Requires: olpc-kbdshim, ethtool, systemd-units, evtest, inotify-tools, libusb
+BuildRequires: kernel-headers, NetworkManager-glib-devel, libusb1-devel, systemd-devel
+Requires: olpc-kbdshim, ethtool, evtest, inotify-tools, libusb
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 ExclusiveArch: %{ix86} %{arm}
 
@@ -66,14 +69,12 @@ install -p -m 644 usb-inhibits %{buildroot}%{_sysconfdir}/powerd/flags/usb-inhib
 install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd/powerd-dbus
 install -p -m 644 powerd-dbus/powerd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/powerd.conf
 
-install -d %{buildroot}/lib/systemd/system
-install -p -m 644 powerd.service %{buildroot}/lib/systemd/system/powerd.service
-install -p -m 644 olpc-switchd.service %{buildroot}/lib/systemd/system/olpc-switchd.service
+install -d %{buildroot}/%{_unitdir}
+install -p -m 644 powerd.service %{buildroot}/%{_unitdir}/powerd.service
+install -p -m 644 olpc-switchd.service %{buildroot}/%{_unitdir}/olpc-switchd.service
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
-
 %{_sbindir}/olpc-switchd
 %{_sbindir}/powerd
 %{_libexecdir}/powerd/pnmto565fb
@@ -81,7 +82,7 @@ install -p -m 644 olpc-switchd.service %{buildroot}/lib/systemd/system/olpc-swit
 %{_bindir}/powerd-config
 %{_bindir}/olpc-nosleep
 %{_libexecdir}/powerd/power-logger
-/lib/systemd/system/*
+%{_unitdir}/*.service
 %config(noreplace) %{_sysconfdir}/powerd/pleaseconfirm.pgm
 %config(noreplace) %{_sysconfdir}/powerd/shuttingdown.pgm
 %config(noreplace) %{_sysconfdir}/powerd/powerd.conf
@@ -89,37 +90,27 @@ install -p -m 644 olpc-switchd.service %{buildroot}/lib/systemd/system/olpc-swit
 %{_sysconfdir}/powerd/version
 
 %files dbus
-%defattr(-,root,root,-)
 %{_libexecdir}/powerd/powerd-dbus
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/powerd.conf
 
+
 %post
-# Only on install
-if [ $1 = 1 ] ; then
-	systemctl enable powerd.service
-	systemctl enable olpc-switchd.service
-fi
-exit 0
+%systemd_post powerd.service
+%systemd_post olpc-switchd.service
 
 %preun
-# Only on uninstall
-if [ $1 = 0 ] ; then
-	systemctl disable powerd.service
-	systemctl stop powerd.service
-	systemctl disable olpc-switchd.service
-	systemctl stop powerd.service
-fi
-exit 0
+%systemd_preun powerd.service
+%systemd_preun olpc-switchd.service
 
 %postun
-# Restart after upgrade
-if [ "$1" -ge "1" ] ; then
-	systemctl restart olpc-switchd.service
-	systemctl restart powerd.service
-fi
-exit 0
+%systemd_postun_with_restart powerd.service
+%systemd_postun_with_restart olpc-switchd.service
+
 
 %changelog
+* Sun May 11 2014 Peter Robinson <pbrobinson at fedoraproject.org> 110-3
+- Update systemd scripts to latest distro specs (RHBZ 1094920)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 110-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild