From 081afaffb23badf786ad3f4016bb3106d3e4be6a Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 3 Apr 2012 02:15:55 +0200 Subject: [PATCH] Bump to libmtp 1.1.3 --- .gitignore | 1 + 0001-Skip-probe-on-Canon-0x22-products.patch | 42 -------------------- libmtp.spec | 9 +++-- sources | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 0001-Skip-probe-on-Canon-0x22-products.patch diff --git a/.gitignore b/.gitignore index a25e9c1..be1bb36 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ i386 /libmtp-1.1.0.tar.gz /libmtp-1.1.1.tar.gz /libmtp-1.1.2.tar.gz +/libmtp-1.1.3.tar.gz diff --git a/0001-Skip-probe-on-Canon-0x22-products.patch b/0001-Skip-probe-on-Canon-0x22-products.patch deleted file mode 100644 index 185e12f..0000000 --- a/0001-Skip-probe-on-Canon-0x22-products.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1ff1a64acc1f789e85029d41c71903d119b5c8bb Mon Sep 17 00:00:00 2001 -From: Linus Walleij -Date: Sat, 28 Jan 2012 10:54:37 +0100 -Subject: [PATCH] Skip probe on Canon 0x22* products - -Signed-off-by: Linus Walleij ---- - util/mtp-hotplug.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/util/mtp-hotplug.c b/util/mtp-hotplug.c -index 3709385..959b034 100644 ---- a/util/mtp-hotplug.c -+++ b/util/mtp-hotplug.c -@@ -2,7 +2,7 @@ - * \file mtp-hotplug.c - * Program to create hotplug scripts. - * -- * Copyright (C) 2005-2011 Linus Walleij -+ * Copyright (C) 2005-2012 Linus Walleij - * Copyright (C) 2006-2008 Marcus Meissner - * - * This library is free software; you can redistribute it and/or -@@ -140,11 +140,14 @@ int main (int argc, char **argv) - printf("SUBSYSTEM==\"usb\", GOTO=\"libmtp_usb_rules\"\n" - "GOTO=\"libmtp_rules_end\"\n\n" - "LABEL=\"libmtp_usb_rules\"\n\n"); -- printf("# Some sensitive devices we surely don\'t wanna probe, color instruments\n"); -+ printf("# Some sensitive devices we surely don\'t wanna probe\n"); -+ printf("# Color instruments\n"); - printf("ATTR{idVendor}==\"0670\", GOTO=\"libmtp_rules_end\"\n"); - printf("ATTR{idVendor}==\"0765\", GOTO=\"libmtp_rules_end\"\n"); - printf("ATTR{idVendor}==\"085c\", GOTO=\"libmtp_rules_end\"\n"); - printf("ATTR{idVendor}==\"0971\", GOTO=\"libmtp_rules_end\"\n"); -+ printf("# Canon scanners that look like MTP devices (PID 0x22nn)\n"); -+ printf("ATTR{idVendor}==\"04a9\", ATTR{idProduct}==\"22*\", GOTO=\"libmtp_rules_end\"\n"); - printf("\n"); - break; - case style_udev_old: --- -1.7.7.6 - diff --git a/libmtp.spec b/libmtp.spec index 765f8f2..a75cfaf 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -2,14 +2,13 @@ # RPM repository. Name: libmtp -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?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: 0001-Skip-probe-on-Canon-0x22-products.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ Requires: udev @@ -44,7 +43,6 @@ library for MTP media players. %prep %setup -q -%patch0 -p1 -b .canonscanner %build %configure --disable-static \ @@ -104,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 03 2012 Linus Walleij 1.1.3-1 +- Upstream update with several bug fixes including Fedora patch + * Sat Jan 28 2012 Linus Walleij 1.1.2-2 - Bugfix to avoid probing Canon scanners diff --git a/sources b/sources index fb3f6e4..f388094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dc708757e3fd3ccce7445b4f2171263 libmtp-1.1.2.tar.gz +11529eedaf0e1fc00cdd6119eec525f0 libmtp-1.1.3.tar.gz