rpms/usbmuxd/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 usbmuxd.spec, 1.2, 1.3

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/usbmuxd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19716

Modified Files:
	.cvsignore sources usbmuxd.spec 
Log Message:
 - New 1.0.0-rc1 test release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 07:48:20 -0000	1.2
+++ .cvsignore	29 Oct 2009 11:23:18 -0000	1.3
@@ -1 +1 @@
-usbmuxd-0.1.4.tar.gz
+usbmuxd-1.0.0-rc1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 07:48:20 -0000	1.2
+++ sources	29 Oct 2009 11:23:18 -0000	1.3
@@ -1 +1 @@
-bc57116f092a922653ba472177f082f0  usbmuxd-0.1.4.tar.gz
+fd5b8a4a368776ab4cc96d0805eca757  usbmuxd-1.0.0-rc1.tar.bz2


Index: usbmuxd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/usbmuxd/devel/usbmuxd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- usbmuxd.spec	14 Aug 2009 15:36:06 -0000	1.2
+++ usbmuxd.spec	29 Oct 2009 11:23:18 -0000	1.3
@@ -1,18 +1,20 @@
 Name:		usbmuxd
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	1.0.0
+Release:	0.1.rc1%{?dist}
 Summary:	Daemon for communicating with Apple's iPod Touch and iPhone
 
 Group:		Applications/System
-License:	GPLv2+ and LGPLv2+
+# All code is dual licenses as GPLv3+ or GPLv2+, except libusbmuxd which is LGPLv2+.
+License:	GPLv3+ or GPLv2+ and LGPLv2+
 URL:		http://cgit.pims.selfip.net/usbmuxd/
-Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
+#Source0:	http://cgit.pims.selfip.net/%{name}/snapshot/%{name}-%{version}.tar.gz
+Source0:	%{name}-1.0.0-rc1.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libusb-devel
-BuildRequires:	automake autoconf libtool
+BuildRequires:	libusb1-devel
+BuildRequires:	cmake
 
-Patch0:		0002-Port-udev-rules-to-newer-kernels.patch
+#Patch0:		0002-Port-udev-rules-to-newer-kernels.patch
 
 %description
 usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone
@@ -29,21 +31,25 @@ Requires: pkgconfig
 Files for development with %{name}.
 
 %prep
-%setup -q
-%patch0 -p1 -b .new-kernel
+%setup -q -n %{name}-1.0.0-rc1
 
 %build
-%configure --enable-static=no
+export CMAKE_PREFIX_PATH=/usr
+%{cmake} .
+
 make %{?_smp_mflags}
 
 %install
+export CMAKE_PREFIX_PATH=/usr$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
+
+# Move libs to correct dir
+mv $RPM_BUILD_ROOT/usr/lib/libusbmuxd.* $RPM_BUILD_ROOT%{_libdir}
 
 # Install udev rules in the correct location
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
+#rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
+#install -D -p -m0644 udev/85-usbmuxd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/85-usbmuxd.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,11 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README COPYING
+%doc AUTHORS README COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 README.devel
 /lib/udev/rules.d/85-usbmuxd.rules
 %{_bindir}/iproxy
-%{_libdir}/libusbmuxd.so.*
 %{_sbindir}/usbmuxd
+%{_libdir}/libusbmuxd.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -68,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libusbmuxd.pc
 
 %changelog
+* Tue Oct 27 2009 Peter Robinson <pbrobinson at gmail.com> 1.0.0-0.1.rc1
+- New 1.0.0-rc1 test release
+
 * Fri Aug 14 2009 Bastien Nocera <bnocera at redhat.com> 0.1.4-2
 - Make usbmuxd autostart on newer kernels
 - (Still doesn't exit properly though)