Bump to new upstream release 2.5.8

This uses the latest upstream which also incorporates two patches.
So we no longer need to carry those patches, they are dropped.

gphoto2-ixany.patch

@@ -1,14 +0,0 @@
-diff -up gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany gphoto2-2.4.0/libgphoto2-2.4.0/libgphoto2_port/serial/unix.c
---- libgphoto2-2.4.0/libgphoto2_port/serial/unix.c.ixany	2007-07-27 02:36:13.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/serial/unix.c	2008-02-25 06:40:40.000000000 +0100
-@@ -98,6 +98,10 @@
- 
- #define CHECK(result) {int r=(result); if (r<0) return (r);}
- 
-+#ifndef IXANY
-+#define IXANY	0004000
-+#endif
-+
- /* Linux */
- #ifdef __linux__
- /* devfs is accounted for in the implementation */

libgphoto2-usb-result.patch

@@ -1,20 +0,0 @@
-diff -up libgphoto2-2.5.7/libgphoto2_port/libusb1/libusb1.c.usb-result libgphoto2-2.5.7/libgphoto2_port/libusb1/libusb1.c
---- libgphoto2-2.5.7/libgphoto2_port/libusb1/libusb1.c.usb-result	2014-12-06 13:09:06.000000000 +0000
-+++ libgphoto2-2.5.7/libgphoto2_port/libusb1/libusb1.c	2015-03-12 11:01:26.746472288 +0000
-@@ -545,13 +545,14 @@ gp_port_usb_check_int (GPPort *port, cha
- static int
- gp_port_generic_usb_msg(GPPort *port, int request, int value, int index, char *bytes, int size, int flags, int default_error)
- {
-+	int handled;
- 	C_PARAMS (port && port->pl->dh);
- 
--	C_LIBUSB (libusb_control_transfer (port->pl->dh, flags, request, value, index,
-+	C_LIBUSB (handled = libusb_control_transfer (port->pl->dh, flags, request, value, index,
- 			(unsigned char*)bytes, size, port->timeout),
- 		  default_error);
- 
--	return GP_OK;
-+	return handled;
- }
- 
- static int

libgphoto2.spec

@@ -1,8 +1,8 @@
 %global udevdir %(pkg-config --variable=udevdir udev)
 
 Name:           libgphoto2
-Version:        2.5.7
-Release:        4%{?dist}
+Version:        2.5.8
+Release:        1%{?dist}
 Summary:        Library for accessing digital cameras
 Group:          Development/Libraries
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
@@ -11,9 +11,7 @@ URL:            http://www.gphoto.org/
 Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 Patch1:         gphoto2-pkgcfg.patch
 Patch2:         gphoto2-storage.patch
-Patch3:         gphoto2-ixany.patch
-Patch4:         gphoto2-device-return.patch
-Patch5:         libgphoto2-usb-result.patch
+Patch3:         gphoto2-device-return.patch
 BuildRequires:  libusbx-devel
 BuildRequires:  lockdev-devel
 BuildRequires:  libexif-devel
@@ -52,9 +50,7 @@ use libgphoto2.
 %setup -q
 %patch1 -p1 -b .pkgcfg
 %patch2 -p1 -b .storage
-%patch3 -p1 -b .ixany
-%patch4 -p1 -b .device-return
-%patch5 -p1 -b .usb-result
+%patch3 -p1 -b .device-return
 
 for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
     mv ${i} ${i}.old
@@ -144,6 +140,11 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 %{_mandir}/man3/*
 
 %changelog
+* Wed Oct 28 2015 Jon Disnard <parasense@fedoraproject.org> 2.5.8-1
+- Update to 2.5.8 for new device support
+- Drop USB result patch that went upstream (formerly patch#5)
+- Drop IXANY patch that went upstream (formerly patch#3)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-6b20635dc9120efb3d23c3b5201894a2  libgphoto2-2.5.7.tar.bz2
+873ab01aced49c6b92a98e515db5dcef  libgphoto2-2.5.8.tar.bz2