[libgphoto2] update to 2.5.0

[Jindrich Novy]

commit b5a48271202d789b5c61941eb111b84e26e70990
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Wed Jul 11 09:31:09 2012 +0200

    update to 2.5.0

 .gitignore               |    2 +-
 gphoto2-maxentries.patch |   12 ------------
 libgphoto2.spec          |   17 +++++++++--------
 sources                  |    2 +-
 4 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e80910a..0eb9d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libgphoto2-2.4.14.tar.bz2
+/libgphoto2-2.5.0.tar.bz2
diff --git a/libgphoto2.spec b/libgphoto2.spec
index bea9d37..2edfa84 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -1,6 +1,6 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.14
+Version: 2.5.0
 Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
@@ -10,11 +10,10 @@ Source0: http://downloads.sourceforge.net/gphoto/libgphoto2-%{version}.tar.bz2
 Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
-Patch4: gphoto2-maxentries.patch
-Patch5: gphoto2-device-return.patch
+Patch4: gphoto2-device-return.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
-BuildRequires: libusb-devel >= 0.1.5
+BuildRequires: libusb1-devel
 BuildRequires: lockdev-devel
 BuildRequires: libexif-devel
 BuildRequires: libjpeg-devel
@@ -53,8 +52,7 @@ use libgphoto2.
 %patch1 -p1 -b .pkgcfg
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
-%patch4 -p1 -b .maxentries
-%patch5 -p1 -b .device-return
+%patch4 -p1 -b .device-return
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -131,8 +129,8 @@ rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
 rm -rf %{buildroot}%{_libdir}/*.la
 
-%find_lang %{name}-2
-%find_lang %{name}_port-0
+%find_lang %{name}-6
+%find_lang %{name}_port-10
 cat libgphoto2*.lang >> %{name}.lang
 
 %clean
@@ -168,6 +166,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 11 2012 Jindrich Novy <jnovy at redhat.com> 2.5.0-1
+- update to 2.5.0
+
 * Mon Apr 16 2012 Jindrich Novy <jnovy at redhat.com> 2.4.14-1
 - update to 2.4.14
 
diff --git a/sources b/sources
index f54ca8a..ef196a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7fc6cafa6343f2457976dbe9f2d9d68  libgphoto2-2.4.14.tar.bz2
+467638d80ec0ef057999361aeb49d123  libgphoto2-2.5.0.tar.bz2