Accepting request 61332 from devel:libraries:c_c++

Accepted submit request 61332 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/61332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmtp?expand=0&rev=40

0001-do-not-match-PTP-generic-interface.patch

@@ -1,33 +0,0 @@
-From 9e516b92147fe6abbfe8c8eca593fb98e542e297 Mon Sep 17 00:00:00 2001
-From: Marcus Meissner <meissner@novell.com>
-Date: Tue, 25 Jan 2011 16:05:02 +0100
-Subject: [PATCH] do not match PTP generic interface
-
----
- src/libusb-glue.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/libusb-glue.c b/src/libusb-glue.c
-index ea22384..e7fee3d 100644
---- a/src/libusb-glue.c
-+++ b/src/libusb-glue.c
-@@ -269,6 +269,8 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
- 	  struct usb_interface_descriptor *intf =
- 	    &dev->config[i].interface[j].altsetting[k];
- 
-+#if 0
-+	/* This detects _all_ PTP cameras and marks them as MTP devices. Not good. -Marcus */
- 	  /*
- 	   * Check for Still Image Capture class with PIMA 15740 protocol,
- 	   * also known as PTP
-@@ -284,6 +286,7 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
-             usb_close(devh);
-             return 1;
- 	  }
-+#endif
-           buf[0] = '\0';
-           ret = usb_get_string_simple(devh,
- 				      dev->config[i].interface[j].altsetting[k].iInterface,
--- 
-1.7.3.4
-

libmtp-1.0.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2006a710204669dd56f4abb2922674a66cc0a36341405eb24af611d6f6b7a9f1
-size 474831

libmtp-1.0.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a0b6ef8edc5504bbfd733b37d15f5145130481216b0be513a5eed19dd46d5d6
+size 476126

libmtp.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 15 11:02:08 CET 2011 - meissner@suse.de
+
+- updated to 1.0.6
+  * even less aggressive mtp probing (not detecting nearly all
+    devices as MTP) bnc#668986
+  * some more USB ids
+
 -------------------------------------------------------------------
 Tue Jan 25 16:08:21 CET 2011 - meissner@suse.de
 

libmtp.spec

@@ -26,10 +26,9 @@ License:        LGPLv2.1+
 Group:          Productivity/Multimedia/Sound/Players
 AutoReqProv:    on
 Summary:        Commandline utilities for access to MTP Players
-Version:        1.0.4
+Version:        1.0.6
 Release:        2
 Source0:        %name-%version.tar.bz2
-Patch0:         0001-do-not-match-PTP-generic-interface.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -121,10 +120,9 @@ Authors:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-doxygen
 make
 
 %install
@@ -134,6 +132,8 @@ install -c -m 644 libmtp.fdi $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thi
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/libmtp*
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+mv $RPM_BUILD_ROOT/lib/udev/rules.d/libmtp.rules $RPM_BUILD_ROOT/lib/udev/rules.d/39-libmtp.rules
+
 %post -n libmtp8 -p /sbin/ldconfig
 
 %postun -n libmtp8 -p /sbin/ldconfig
@@ -154,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 %dir /lib/udev
 /lib/udev/mtp-probe
 %dir /lib/udev/rules.d
-%config /lib/udev/rules.d/libmtp.rules
+%config /lib/udev/rules.d/39-libmtp.rules
 
 %files devel
 %defattr(-, root, root)