[libmtp/f15] Fix some bugs in the bugfix

[Linus Walleij]

commit aad49f023c7ab7d24eb63b1825902649e5f6ae96
Author: Linus Walleij <triad at df.lth.se>
Date:   Sat Oct 22 23:34:26 2011 +0200

    Fix some bugs in the bugfix

 libmtp.spec        |    5 ++++-
 various-bugs.patch |   20 +++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/libmtp.spec b/libmtp.spec
index c562175..59b7872 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        1.0.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 22 2011 Linus Walleij <triad at df.lth.se> 1.0.6-5
+- Warm the build system by fixing bugs in the bugfix.
+
 * Sat Oct 22 2011 Linus Walleij <triad at df.lth.se> 1.0.6-4
 - Bring in as many bug fixes from the 1.1.1 release we can without
   changing the ABI.
diff --git a/various-bugs.patch b/various-bugs.patch
index 059419f..3819b6b 100644
--- a/various-bugs.patch
+++ b/various-bugs.patch
@@ -1,6 +1,6 @@
 diff -ur libmtp-1.0.6-orig/src/libusb-glue.c libmtp-1.0.6/src/libusb-glue.c
 --- libmtp-1.0.6-orig/src/libusb-glue.c	2011-06-23 19:33:51.736858307 +0200
-+++ libmtp-1.0.6/src/libusb-glue.c	2011-10-22 21:58:02.431358209 +0200
++++ libmtp-1.0.6/src/libusb-glue.c	2011-10-22 23:31:01.766206773 +0200
 @@ -275,6 +275,13 @@
  	    &dev->config[i].interface[j].altsetting[k];
  
@@ -44,10 +44,24 @@ diff -ur libmtp-1.0.6-orig/src/libusb-glue.c libmtp-1.0.6/src/libusb-glue.c
  
      if(init_ptp_usb(params, ptp_usb, libusb_device) <0) {
        LIBMTP_ERROR("LIBMTP PANIC: Could not init USB on second attempt\n");
-Endast i libmtp-1.0.6/src: libusb-glue.c.orig
+diff -ur libmtp-1.0.6-orig/src/libusb-glue.h libmtp-1.0.6/src/libusb-glue.h
+--- libmtp-1.0.6-orig/src/libusb-glue.h	2011-06-23 19:33:51.736858307 +0200
++++ libmtp-1.0.6/src/libusb-glue.h	2011-10-22 23:32:29.377583765 +0200
+@@ -136,6 +136,10 @@
+   ((a)->rawdevice.device_entry.device_flags & DEVICE_FLAG_UNIQUE_FILENAMES)
+ #define FLAG_SWITCH_MODE_BLACKBERRY(a) \
+   ((a)->rawdevice.device_entry.device_flags & DEVICE_FLAG_SWITCH_MODE_BLACKBERRY)
++#define FLAG_LONG_TIMEOUT(a) \
++  ((a)->rawdevice.device_entry.device_flags & DEVICE_FLAG_LONG_TIMEOUT)
++#define FLAG_FORCE_RESET_ON_CLOSE(a) \
++  ((a)->rawdevice.device_entry.device_flags & DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
+ 
+ /* connect_first_device return codes */
+ #define PTP_CD_RC_CONNECTED	0
+Endast i libmtp-1.0.6/src: libusb-glue.h.orig
 diff -ur libmtp-1.0.6-orig/util/mtp-hotplug.c libmtp-1.0.6/util/mtp-hotplug.c
 --- libmtp-1.0.6-orig/util/mtp-hotplug.c	2011-06-23 19:33:51.713858478 +0200
-+++ libmtp-1.0.6/util/mtp-hotplug.c	2011-10-22 21:54:01.921989656 +0200
++++ libmtp-1.0.6/util/mtp-hotplug.c	2011-10-22 23:31:01.766206773 +0200
 @@ -140,6 +140,12 @@
        printf("SUBSYSTEM==\"usb\", GOTO=\"libmtp_usb_rules\"\n"
  	     "GOTO=\"libmtp_rules_end\"\n\n"