diff --git a/gphoto2-libusb-fix-build.patch b/gphoto2-libusb-fix-build.patch new file mode 100644 index 0000000..e6d20f3 --- /dev/null +++ b/gphoto2-libusb-fix-build.patch @@ -0,0 +1,11 @@ +--- libgphoto2-2.4.0/libgphoto2_port/configure.ac~ 2007-07-28 09:40:51.000000000 -0400 ++++ 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], diff --git a/libgphoto2.spec b/libgphoto2.spec index 0683c86..c3a1e14 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,7 +1,7 @@ Summary: Library for accessing digital cameras Name: libgphoto2 Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 License: GPLv2+ and GPLv2 Group: Development/Libraries @@ -12,6 +12,7 @@ Patch2: gphoto2-storage.patch Patch3: gphoto2-ixany.patch Patch4: gphoto2-norpath.patch Patch5: gphoto2-data-phase.patch +Patch6: gphoto2-libusb-fix-build.patch Url: http://www.gphoto.org/ Requires: lockdev BuildRequires: libusb-devel >= 0.1.5 @@ -49,6 +50,7 @@ use libgphoto2. %patch3 -p1 -b .ixany %patch4 -p1 -b .norpath %patch5 -p1 -b .data-phase +%patch6 -p1 -b .libusb-build cat > gphoto2.pc.in << EOF prefix=@prefix@ @@ -139,6 +141,9 @@ rm -rf "${RPM_BUILD_ROOT}" %{_mandir}/man3/* %changelog +* Mon Apr 21 2008 Jindrich Novy 2.4.0-2 +- apply patch to fix build with libusb + * Fri Apr 18 2008 Jindrich Novy 2.4.0-1 - backport patch from upstream to avoid segfault when data phase is skipped for certain devices (#435413)