From 32a1f40a981023cc904a4c87e9ee0656fd629c98 Mon Sep 17 00:00:00 2001
From: Linus Walleij <snirkel@fedoraproject.org>
Date: Sat, 4 Aug 2007 21:37:41 +0000
Subject: [PATCH] New upstream version fixing the patched issues too.

---
 .cvsignore                   |  2 +-
 libmtp-0.1.5-udevrules.patch | 24 ------------------------
 libmtp.spec                  | 20 +++++++-------------
 sources                      |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 libmtp-0.1.5-udevrules.patch

diff --git a/.cvsignore b/.cvsignore
index 46d4f67..75fbdb4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libmtp-0.1.5.tar.gz
+libmtp-0.2.0.tar.gz
diff --git a/libmtp-0.1.5-udevrules.patch b/libmtp-0.1.5-udevrules.patch
deleted file mode 100644
index 7e8292d..0000000
--- a/libmtp-0.1.5-udevrules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libmtp-0.1.5/examples/hotplug.c.udevrules	2007-07-30 09:40:11.000000000 +0200
-+++ libmtp-0.1.5/examples/hotplug.c	2007-07-30 09:44:32.000000000 +0200
-@@ -76,7 +76,11 @@
-     case style_udev:
-       printf("# UDEV-style hotplug map for libmtp\n");
-       printf("# Put this file in /etc/udev/rules.d\n\n");
--      printf("SUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"libmtp_rules_end\"\n\n");
-+      printf("ACTION!=\"add\", GOTO=\"libmtp_rules_end\"\n"
-+             "SUBSYSTEM==\"usb\", GOTO=\"libmtp_rules\"\n"
-+             "SUBSYSTEM==\"usb_device\", GOTO=\"libmtp_rules\"\n\n"
-+             "GOTO=\"libmtp_rules_end\"\n\n"
-+             "LABEL=\"libmtp_rules\"\n\n");
-       break;
-     case style_usbmap:
-       printf("# This usermap will call the script \"libmtp.sh\" whenever a known MTP device is attached.\n\n");
-@@ -103,7 +107,7 @@
- 	} else {
- 	  action = default_udev_action;
- 	}
--	printf("SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", %s\n", entry->vendor_id, entry->product_id, action);
-+	printf("ATTR{idVendor}==\"%04x\", ATTR{idProduct}==\"%04x\", %s\n", entry->vendor_id, entry->product_id, action);
- 	break;
-       }
-       case style_usbmap:
diff --git a/libmtp.spec b/libmtp.spec
index 9242761..47ef123 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -1,25 +1,15 @@
 # SPEC file for libmtp, primary target is the Fedora Extras
 # RPM repository.
-#
-# For testing a certain distribution, rely on macros that
-# you define in your ".rpmmacros" file. For example, for
-# test building a Fedora Extras package, define the following
-# two macros in .rpmmacros:
-#
-# %dist .fc6
-# %fedora 6
-#
 
 Name:           libmtp
-Version:        0.1.5
-Release:        2%{?dist}
+Version:        0.2.0
+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
 Source1:        libmtp.perms
-Patch: 		libmtp-0.1.5-udevrules.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:        LGPL
 Requires:       udev
@@ -55,7 +45,6 @@ library for MTP media players.
 
 %prep
 %setup -q
-%patch -p1 -b .udevrules
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -107,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 4 2007 Linus Walleij <triad@df.lth.se> 0.2.0-1
+- New upstream release.
+- Fixes (hopefully) the issues found by Harald.
+- Dependent apps will need to recompile and patch some minor code.
+
 * Mon Jul 30 2007 Harald Hoyer <harald@redhat.com> - 0.1.5-2
 - changed udev rules for new kernel and udev versions
 
diff --git a/sources b/sources
index 61eb3f1..55ef510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-597b62d994d9491531b9e67190f6cfe7  libmtp-0.1.5.tar.gz
+a5b433b9b3b1906b4f6d332a8150b7d0  libmtp-0.2.0.tar.gz