packages: usbmuxd/usbmuxd.spec, usbmuxd/cmake-find-usb.patch (NEW), usbmuxd...

[glen]

Author: glen                         Date: Fri May 11 23:10:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.8, new soname

---- Files affected:
packages/usbmuxd:
   usbmuxd.spec (1.5 -> 1.6) , cmake-find-usb.patch (NONE -> 1.1)  (NEW), usbmuxd-udevuser.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/usbmuxd/usbmuxd.spec
diff -u packages/usbmuxd/usbmuxd.spec:1.5 packages/usbmuxd/usbmuxd.spec:1.6
--- packages/usbmuxd/usbmuxd.spec:1.5	Sun Mar 27 21:09:03 2011
+++ packages/usbmuxd/usbmuxd.spec	Sat May 12 01:10:05 2012
@@ -2,18 +2,18 @@
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 Summary(pl.UTF-8):	Demon do komunikacji z urządzeniami iPod Touch i iPhone firmy Apple
 Name:		usbmuxd
-Version:	1.0.7
+Version:	1.0.8
 Release:	1
-License:	GPL v2+ (daemon) and LGPL v2+ (library)
+License:	GPL v2+ (daemon) and LGPL v2.1+ (library)
 Group:		Daemons
-Source0:	http://marcansoft.com/uploads/usbmuxd/%{name}-%{version}.tar.bz2
-# Source0-md5:	6f431541f3177fa06aa6df9ceecb2da0
-Patch0:		%{name}-udevuser.patch
+Source0:	http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5:	4b33cc78e479e0f9a6745f9b9a8b60a8
+Patch0:		cmake-find-usb.patch
 URL:		http://marcansoft.com/blog/iphonelinux/usbmuxd/
 BuildRequires:	cmake >= 2.6
 BuildRequires:	libplist-devel
 BuildRequires:	libusb-devel >= 1.0.3
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.600
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -67,18 +67,11 @@
 %build
 install -d build
 cd build
-%cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
-	../
-
+%cmake ..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -95,7 +88,7 @@
 	%groupremove usbmux
 fi
 
-%post libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files
@@ -108,7 +101,7 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libusbmuxd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libusbmuxd.so.1
+%attr(755,root,root) %ghost %{_libdir}/libusbmuxd.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -124,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/05/11 23:10:05  glen
+- up to 1.0.8, new soname
+
 Revision 1.5  2011/03/27 19:09:03  glen
 - up to 1.0.7
 
@@ -138,4 +134,3 @@
 
 Revision 1.1  2010/02/11 11:36:13  megabajt
 - new
-

================================================================
Index: packages/usbmuxd/cmake-find-usb.patch
diff -u /dev/null packages/usbmuxd/cmake-find-usb.patch:1.1
--- /dev/null	Sat May 12 01:10:10 2012
+++ packages/usbmuxd/cmake-find-usb.patch	Sat May 12 01:10:05 2012
@@ -0,0 +1,21 @@
+blah
+
+includedir variable is /usr/include in .pc:
+includedir=/usr/include
+
+bt header is in libusb-1.0 subdir:
+Cflags: -I${includedir}/libusb-1.0
+
+so this cmake macro fails:
+
+--- usbmuxd-1.0.8/Modules/FindUSB.cmake~	2012-04-08 01:50:09.000000000 +0300
++++ usbmuxd-1.0.8/Modules/FindUSB.cmake	2012-05-12 02:06:09.506368130 +0300
+@@ -24,7 +26,7 @@
+ # Include dir
+ find_path(USB_INCLUDE_DIR
+   NAMES libusb.h
+-  PATHS ${USB_PKGCONF_INCLUDE_DIRS}
++  PATHS /usr/include/libusb-1.0
+ )
+ 
+ # Finally the library itself
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/usbmuxd/usbmuxd.spec?r1=1.5&r2=1.6