rpms/gphoto2/F-9 gphoto2-libusb-fix-build.patch, NONE, 1.1 gphoto2.spec, 1.89, 1.90

[David Zeuthen (davidz)]

Author: davidz

Update of /cvs/pkgs/rpms/gphoto2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1888

Modified Files:
	gphoto2.spec 
Added Files:
	gphoto2-libusb-fix-build.patch 
Log Message:
* Tue Apr 22 2008 David Zeuthen <davidz at redhat.com> 2.4.0-10
- Rebuild



gphoto2-libusb-fix-build.patch:

--- NEW FILE gphoto2-libusb-fix-build.patch ---
--- gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/configure.ac~	2007-07-28 09:40:51.000000000 -0400
+++ gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/configure.ac	2008-04-19 14:01:27.000000000 -0400
@@ -337,7 +337,7 @@
 dnl ---------------------------------------------------------------------------
 GP_CONFIG_MSG([USB ports])
 GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5],
-		[usb.h],[usb_busses],[
+		[usb.h],[usb_get_busses],[
 	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb"
 ],[],
 		[disable-explicitly],


Index: gphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gphoto2/F-9/gphoto2.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gphoto2.spec	17 Apr 2008 04:26:20 -0000	1.89
+++ gphoto2.spec	23 Apr 2008 16:22:48 -0000	1.90
@@ -8,7 +8,7 @@
 %define libpkg libgphoto2
 %define libver 2.4.0
 Version: %{pkgver}
-Release: 7%{?dist}
+Release: 10%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,7 @@
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-data-phase.patch
+Patch100: gphoto2-libusb-fix-build.patch
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 Provides: libgphoto2 = %{libver}
@@ -29,6 +30,10 @@
 BuildRequires: libtool, pkgconfig, sharutils
 BuildRequires: libtool-ltdl-devel, popt-devel
 
+# for gphoto2-libusb-fix-build.patch
+BuildRequires: automake autoconf
+
+
 ####################################
 %description
 The gPhoto2 project is a universal, free application and library
@@ -74,6 +79,7 @@
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .data-phase
+%patch100 -p1 -b .libusb
 
 # write pkg-config stuff 
 cat > gphoto2.pc.in << EOF
@@ -97,6 +103,7 @@
 
 pushd %{libpkg}-%{libver}
 export CFLAGS=$RPM_OPT_FLAGS
+autoreconf
 %configure \
 	--with-drivers=all \
 	--with-doc-dir=%{_docdir}/%{name} \
@@ -203,6 +210,15 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Apr 22 2008 David Zeuthen <davidz at redhat.com> 2.4.0-10
+- Rebuild
+
+* Tue Apr 22 2008 David Zeuthen <davidz at redhat.com> 2.4.0-9
+- Rebuild
+
+* Sat Apr 19 2008 David Zeuthen <davidz at redhat.com> 2.4.0-8
+- Add a patch to fix build on ppc
+
 * Thu Apr 17 2008 Jindrich Novy <jnovy at redhat.com> 2.4.0-7
 - backport patch from upstream to avoid segfault when
   data phase is skipped for certain devices (#435413)