[usbmuxd] Initial 1.0.9 snapshot

Mon May 5 17:06:49 UTC 2014

commit 5c2aa1ae0ba2c1e3c627803f3c4b4950171cd49a
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 5 18:06:57 2014 +0100

    Initial 1.0.9 snapshot

 .gitignore                                 |    1 +
 0001-Use-systemd-to-start-usbmuxd.patch    |   61 -------------------------
 sources                                    |    2 +-
 usbmuxd-use-systemd-to-start-usbmuxd.patch |   21 +++++++++
 usbmuxd.spec                               |   66 +++++++++++++--------------
 5 files changed, 55 insertions(+), 96 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index bf1f540..c1a86ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ usbmuxd-1.0.5.tar.bz2
 /usbmuxd-1.0.6.tar.bz2
 /usbmuxd-1.0.7.tar.bz2
 /usbmuxd-1.0.8.tar.bz2
+/libusbmuxd-1.0.9.tar.bz2
diff --git a/sources b/sources
index ef8a992..094cddf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b33cc78e479e0f9a6745f9b9a8b60a8  usbmuxd-1.0.8.tar.bz2
+9d63d3a813576548b0a5356ceedf23a8  usbmuxd-1.0.9-c24463e.tar.bz2
diff --git a/usbmuxd-use-systemd-to-start-usbmuxd.patch b/usbmuxd-use-systemd-to-start-usbmuxd.patch
new file mode 100644
index 0000000..e470da3
--- /dev/null
+++ b/usbmuxd-use-systemd-to-start-usbmuxd.patch
@@ -0,0 +1,21 @@
+--- usbmuxd-1.0.9/udev/39-usbmuxd.rules.in.orig	2014-04-21 18:57:45.137269481 +0100
++++ usbmuxd-1.0.9/udev/39-usbmuxd.rules.in	2014-04-21 18:58:47.615294201 +0100
+@@ -1,7 +1,7 @@
+ # usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
+ 
+ # Initialize iOS devices into "deactivated" USB configuration state and run usbmuxd
+-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", RUN+="@prefix@/sbin/usbmuxd -u -U usbmux"
++ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}="0", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service"
+ 
+ # Exit usbmuxd when the last device is removed
+ ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@prefix@/sbin/usbmuxd -x"
+--- /dev/null
++++ b/udev/usbmuxd.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=iOS USB Muxer
++
++[Service]
++Type=simple
++ExecStart=/sbin/usbmuxd -u -U usbmux
++PIDFile=/var/run/usbmuxd.pid
diff --git a/usbmuxd.spec b/usbmuxd.spec
index 9632875..68f5302 100644
--- a/usbmuxd.spec
+++ b/usbmuxd.spec
@@ -1,56 +1,59 @@
+# Tarfile created using git
+# git clone https://github.com/libimobiledevice/usbmuxd.git
+# git archive --format=tar --prefix=%{name}-%{version}/ %{name}-%{version} | bzip2 > ~/%{name}-%{version}.tar.bz2
+# c24463e
+
+%define gittag c24463e
+%define tarfile %{name}-%{version}-%{gittag}.tar.bz2
+
 Name:          usbmuxd
-Version:       1.0.8
-Release:       10%{?dist}
+Version:       1.0.9
+Release:       0.1.%{gittag}%{?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+.
-License:       GPLv3+ or GPLv2+ and LGPLv2+
+License:       GPLv3+ or GPLv2+
 URL:           http://www.libimobiledevice.org/
-Source0:       http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
-Patch0:        0001-Use-systemd-to-start-usbmuxd.patch
+#ource0:       http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
+Source0:       %{tarfile}
+Patch0:        usbmuxd-use-systemd-to-start-usbmuxd.patch
+Patch1:        usbmuxd-default-source.patch
 
-# For systemd.macros
-BuildRequires: systemd
+BuildRequires: libimobiledevice-devel
 BuildRequires: libplist-devel
 BuildRequires: libusbx-devel
-BuildRequires: cmake
+BuildRequires: systemd
+BuildRequires: autoconf automake libtool
+
 Requires(pre): shadow-utils
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Obsoletes: usbmuxd-devel < 1.0.9
 
 %description
 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: libusbx-devel
-
-%description devel
-Files for development with %{name}.
-
 %prep
 %setup -q
 %patch0 -p1 -b .systemd
+%patch1 -p1 -b .def-src
 
 # Set the owner of the device node to be usbmuxd
-sed -i.owner 's/OWNER="usbmux"/OWNER="usbmuxd"/' udev/85-usbmuxd.rules.in
+sed -i.owner 's/OWNER="usbmux"/OWNER="usbmuxd"/' udev/39-usbmuxd.rules.in
 sed -i.user 's/-U usbmux/-U usbmuxd/' udev/usbmuxd.service.in
 
 %build
-export CMAKE_PREFIX_PATH=/usr
-%{cmake} .
+echo "$CFLAGS"
+NOCONFIGURE=1 ./autogen.sh
+%configure
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %pre
@@ -72,20 +75,15 @@ exit 0
 %systemd_postun_with_restart usbmuxd.service 
 
 %files
-%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel
-/lib/udev/rules.d/85-usbmuxd.rules
-/lib/systemd/system/usbmuxd.service
-%{_bindir}/iproxy
+%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3
+/lib/udev/rules.d/39-usbmuxd.rules
+#/lib/systemd/system/usbmuxd.service
 %{_sbindir}/usbmuxd
-%{_libdir}/libusbmuxd.so.*
-
-%files devel
-%doc README.devel
-%{_includedir}/*.h
-%{_libdir}/libusbmuxd.so
-%{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Mon Apr 21 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.0.9-0.1
+- Initial 1.0.9 snapshot
+
 * Thu Oct 10 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.0.8-10
 - Add BR: systemd for systemd.macros (RHBZ #1017493).
 
