[libmtp/f15] Revert "Update to 1.1.1 by:"

Sat Oct 22 20:03:37 UTC 2011

commit 8c664ecb29aaddc5964f77efc5533ccf92231c90
Author: Linus Walleij <triad at df.lth.se>
Date:   Sat Oct 22 21:52:19 2011 +0200

    Revert "Update to 1.1.1 by:"
    
    This reverts commit 24392e1095046f8c4e0a35275d4b231ed14c9362, reversing
    changes made to 8f4bb8d1c77ac4721003d6e2e05f12a6f047203c.

 .gitignore            |    2 -
 libmtp.spec           |   54 ++++++++++++++++++++++++++++--------------------
 probe-3-ep-only.patch |   18 ++++++++++++++++
 sources               |    2 +-
 4 files changed, 50 insertions(+), 26 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fcc4c04..48fb7a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,3 @@ libmtp-1.0.3.tar.gz
 *.rpm
 i386
 /libmtp-1.0.6.tar.gz
-/libmtp-1.1.0.tar.gz
-/libmtp-1.1.1.tar.gz
diff --git a/libmtp.spec b/libmtp.spec
index da2c669..79775f6 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -2,13 +2,15 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        1.1.1
-Release:        1%{?dist}
+Version:        1.0.6
+Release:        3%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
 Group:          System Environment/Libraries
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		probe-3-ep-only.patch
+Patch1:		device-db.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:        LGPLv2+
 Requires:       udev
@@ -20,6 +22,15 @@ This package provides a software library for communicating with MTP
 (Media Transfer Protocol) media players, typically audio players, video
 players etc.
 
+%package hal
+Summary:        Music player information for HAL
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}-%{release}
+Requires:       hal-info
+
+%description hal
+This package provides information about detecting MTP devices using HAL.
+
 %package examples
 Summary:        Example programs for libmtp
 Group:          Applications/Multimedia
@@ -42,10 +53,12 @@ library for MTP media players.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static \
-	   --with-udev-rules=69-libmtp.rules
+	   --with-udev-rules=60-libmtp.rules
 make %{?_smp_mflags}
 
 %install
@@ -66,6 +79,8 @@ ln -sf mtp-connect mtp-newfolder
 ln -sf mtp-connect mtp-sendfile
 ln -sf mtp-connect mtp-sendtr
 popd
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libmtp.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 # Copy documentation to a good place
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
@@ -74,6 +89,8 @@ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 touch -r configure.ac \
       $RPM_BUILD_ROOT%{_includedir}/*.h \
       $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc \
+      $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,40 +100,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root,root,-)
-%{_libdir}/libmtp.so.9*
+%{_libdir}/*.so.*
 /lib/udev/rules.d/*
 /lib/udev/mtp-probe
 
+%files hal
+%defattr(-, root,root,-)
+%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libmtp.so
+%{_libdir}/*.so
 %dir %{_docdir}/%{name}-%{version}
 %{_docdir}/%{name}-%{version}/*
 %{_includedir}/*.h
-%{_libdir}/pkgconfig/libmtp.pc
+%{_libdir}/pkgconfig/*.pc
 
 
 %changelog
-* Sat Oct 22 2011 Linus Walleij <triad at df.lth.se> 1.1.1-1
-- New upstream version fixing problems with a few color devices
-  plus adding new device support. Move udev rules from level
-  60 to level 69 to come after SANE and avoid probing these
-  devices.
-
-* Fri Jun 10 2011 Rex Dieter <rdieter at fedoraproject.org> 1.1.0-2
-- %%files: track abi/soname, so bumps aren't a surprise
-
-* Tue Jun 08 2011 Linus Walleij <triad at df.lth.se> 1.1.0-1
-- New upstream version including fixed bugs and the patch we
-  used to carry. Dependecies need to be rebuilt. (New
-  soversion)
-
-* Tue Jun 07 2011 Linus Walleij <triad at df.lth.se> 1.0.6-3
-- Nuke HAL dependency.
+* Thu Jun 23 2011 Linus Walleij <triad at df.lth.se> 1.0.6-3
+- Update the device database to latest version in an attempt to
+  address issues with Android tablets like the Xoom and Asus tablets
 
 * Fri Apr 01 2011 Linus Walleij <triad at df.lth.se> 1.0.6-2
 - Maybe fixing a probing issue on an input device.
@@ -259,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Oct 24 2007 Linus Walleij <triad at df.lth.se> 0.2.2-2
 - Flat out KILL the Doxygen HTML docs to resolve multiarch conflicts.
-  Either upstream (that's me!) needs to work around the HTML files being
+  Either upstream (that's me!) needs to work around the HTML files being 
   different each time OR Doxygen must stop generating anchors that
   hash the system time, creating different files with each generation.
   Pre-generating the docs is deemed silly. (Someone will disagree.)
diff --git a/probe-3-ep-only.patch b/probe-3-ep-only.patch
new file mode 100644
index 0000000..141dc9e
--- /dev/null
+++ b/probe-3-ep-only.patch
@@ -0,0 +1,18 @@
+diff --git a/src/libusb-glue.c b/src/libusb-glue.c
+index 5d7889b..3c0a124 100644
+--- a/src/libusb-glue.c
++++ b/src/libusb-glue.c
+@@ -284,6 +284,13 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
+ 	    &dev->config[i].interface[j].altsetting[k];
+ 
+ 	  /*
++	   * MTP interfaces have three endpoints, two bulk and one
++	   * interrupt. Don't probe anything else.
++	   */
++	  if (intf->bNumEndpoints != 3)
++	    continue;
++
++	  /*
+ 	   * We only want to probe for the OS descriptor if the
+ 	   * device is USB_CLASS_VENDOR_SPEC or one of the interfaces
+ 	   * in it is, so flag if we find an interface like this.
diff --git a/sources b/sources
index 9ffcac5..8eba198 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-073e1c2a00ba377f68dce47727e185ae  libmtp-1.1.1.tar.gz
+7d3c624d768adba8537f8bc9c0a82cbf  libmtp-1.0.6.tar.gz
