diff --git a/.cvsignore b/.cvsignore index ac300a1..72f12fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgphoto2-2.4.1.tar.bz2 +libgphoto2-2.4.2.tar.bz2 diff --git a/gphoto2-libusb-fix-build.patch b/gphoto2-libusb-fix-build.patch deleted file mode 100644 index e6d20f3..0000000 --- a/gphoto2-libusb-fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 c8b154e..df62d93 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,7 +1,7 @@ Summary: Library for accessing digital cameras Name: libgphoto2 -Version: 2.4.1 -Release: 6%{?dist} +Version: 2.4.2 +Release: 1%{?dist} # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 License: GPLv2+ and GPLv2 Group: Development/Libraries @@ -11,7 +11,6 @@ Patch1: gphoto2-pkgcfg.patch Patch2: gphoto2-storage.patch Patch3: gphoto2-ixany.patch Patch4: gphoto2-maxentries.patch -Patch6: gphoto2-libusb-fix-build.patch Url: http://www.gphoto.org/ Requires: lockdev BuildRequires: libusb-devel >= 0.1.5 @@ -55,7 +54,6 @@ use libgphoto2. %patch2 -p1 -b .storage %patch3 -p1 -b .ixany %patch4 -p1 -b .maxentries -%patch6 -p1 -b .libusb-build # FIXME: These .pc.in files aren't actually being installed? cat > gphoto2.pc.in << \EOF @@ -153,6 +151,11 @@ rm -rf "${RPM_BUILD_ROOT}" %{_mandir}/man3/* %changelog +* Fri Aug 01 2008 Jindrich Novy 2.4.2-1 +- update to 2.4.2 +- contains many fixes in the Canon camera communication interface +- drop build patch, no more needed + * Mon Jul 07 2008 Jindrich Novy 2.4.1-6 - increase maximal number of entries in the camera list (#454245) diff --git a/sources b/sources index 3726a31..2824a81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70c7d2c3e84997f29b4e988e56bd02aa libgphoto2-2.4.1.tar.bz2 +714859617c0b616855f6906280010c5d libgphoto2-2.4.2.tar.bz2