[usbmuxd] Make use of the new systemd macros, Minor updates to spec

[Peter Robinson]

commit 8cbc5be19dc90423843bf7361f52a8aec9346dd8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 4 18:34:27 2012 +0100

    Make use of the new systemd macros, Minor updates to spec

 usbmuxd.spec |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/usbmuxd.spec b/usbmuxd.spec
index 7edba41..203bfa9 100644
--- a/usbmuxd.spec
+++ b/usbmuxd.spec
@@ -1,7 +1,7 @@
 Name:          usbmuxd
 Version:       1.0.8
-Release:       4%{?dist}
-Summary:       Daemon for communicating with Apple's iPod Touch and iPhone
+Release:       5%{?dist}
+Summary:       Daemon for communicating with Apple's iOS devices
 
 Group:         Applications/System
 # All code is dual licenses as GPLv3+ or GPLv2+, except libusbmuxd which is LGPLv2+.
@@ -11,21 +11,24 @@ Source0:       http://marcansoft.com/uploads/usbmuxd/%{name}-%{version}.tar.bz2
 Patch0:        0001-Use-systemd-to-start-usbmuxd.patch
 
 BuildRequires: libplist-devel
-BuildRequires: libusb1-devel
+BuildRequires: libusbx-devel
 BuildRequires: cmake
 Requires(pre): shadow-utils
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description
-usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone
-devices. It allows multiple services on the device to be accessed
-simultaneously.
+usbmuxd is a daemon used for communicating with Apple's iPod Touch, iPhone, 
+iPad and Apple TV devices. It allows multiple services on the device to be 
+accessed simultaneously.
 
 %package devel
 Summary: Development package for %{name}
 Group: Development/Libraries
 Requires: usbmuxd = %{version}-%{release}
 Requires: pkgconfig
-Requires: libusb1-devel
+Requires: libusbx-devel
 
 %description devel
 Files for development with %{name}.
@@ -55,12 +58,19 @@ useradd -r -g usbmuxd -d / -s /sbin/nologin \
 	-c "usbmuxd user" -u 113 usbmuxd
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%systemd_post usbmuxd.service
 
 %postun -p /sbin/ldconfig
 
+%preun
+%systemd_preun usbmuxd.service
+
+%postun
+%systemd_postun_with_restart usbmuxd.service 
+
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel
 /lib/udev/rules.d/85-usbmuxd.rules
 /lib/systemd/system/usbmuxd.service
@@ -69,13 +79,16 @@ exit 0
 %{_libdir}/libusbmuxd.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc README.devel
 %{_includedir}/*.h
 %{_libdir}/libusbmuxd.so
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Thu Oct  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.8-5
+- Make use of the new systemd macros
+- Minor updates to spec
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild