diff --git a/include-config-h.patch b/include-config-h.patch deleted file mode 100644 index 15e9061..0000000 --- a/include-config-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libmtp-1.1.7/src/util.c -=================================================================== ---- libmtp-1.1.7.orig/src/util.c -+++ libmtp-1.1.7/src/util.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include "config.h" - #include "libmtp.h" - #include "util.h" - diff --git a/libmtp-1.1.8.tar.gz b/libmtp-1.1.8.tar.gz deleted file mode 100644 index 908aee7..0000000 --- a/libmtp-1.1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 -size 757109 diff --git a/libmtp-1.1.9.tar.gz b/libmtp-1.1.9.tar.gz new file mode 100644 index 0000000..46f0fd1 --- /dev/null +++ b/libmtp-1.1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 +size 760593 diff --git a/libmtp.changes b/libmtp.changes index 7ce24f3..f556332 100644 --- a/libmtp.changes +++ b/libmtp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 13 19:32:11 UTC 2015 - meissner@suse.com + +- updated to 1.1.9 release + - lots and lots of new ids + - bugfixes +- mtp_DroidTurbo.patch,include-config-h.patch: upstream + ------------------------------------------------------------------- Sat Mar 21 14:28:40 UTC 2015 - meissner@suse.com diff --git a/libmtp.spec b/libmtp.spec index 5805846..9a5b750 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -26,13 +26,10 @@ BuildRequires: pkgconfig(udev) Summary: Commandline utilities for access to MTP Players License: LGPL-2.1+ Group: Productivity/Multimedia/Sound/Players -Version: 1.1.8 +Version: 1.1.9 Release: 0 %define sonum 9 Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz -Patch0: include-config-h.patch -Patch1: mtp_DroidTurbo.patch -# from git 1a2669c6df6c093aec38c0c99a21438d74ccdf33 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } %{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) } @@ -79,8 +76,6 @@ Transfer Protocol) authored by Microsoft. %prep %setup -q -%patch0 -p1 -%patch1 %build echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in @@ -111,6 +106,7 @@ rm -rf %{buildroot}/%{_libdir}/*.la #dir /usr/share/hal/fdi/information/20thirdparty/ #usr/share/hal/fdi/information/20thirdparty/10-usb-music-players-libmtp.fdi %{_udevdir}/mtp-probe +%{_udevdir}/hwdb.d/69-libmtp.hwdb %{_udevrulesdir}/69-libmtp.rules %files devel diff --git a/mtp_DroidTurbo.patch b/mtp_DroidTurbo.patch deleted file mode 100644 index ac92b4c..0000000 --- a/mtp_DroidTurbo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/music-players.h.orig -+++ src/music-players.h -@@ -1910,6 +1910,8 @@ - DEVICE_FLAGS_ANDROID_BUGS }, - { "Motorola", 0x22b8, "XT890/907/Razr (MTP+ADB)", 0x710e, - DEVICE_FLAGS_ANDROID_BUGS }, -+ { "Motorola", 0x22b8, "Droid Turbo Verizon", 0x2ea8, -+ DEVICE_FLAGS_ANDROID_BUGS }, - /* - * XT890/907/Razr - * 710f is USB mass storage