From 8188950807c3378bf5c2a9c37ae7f89967e80d05 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Mon, 30 Jul 2007 07:48:43 +0000
Subject: [PATCH] - changed udev rules for new kernel and udev versions

---
 libmtp-0.1.5-udevrules.patch | 24 ++++++++++++++++++++++++
 libmtp.spec                  |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 libmtp-0.1.5-udevrules.patch

diff --git a/libmtp-0.1.5-udevrules.patch b/libmtp-0.1.5-udevrules.patch
new file mode 100644
index 0000000..7e8292d
--- /dev/null
+++ b/libmtp-0.1.5-udevrules.patch
@@ -0,0 +1,24 @@
+--- 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 b18f3df..9242761 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -12,13 +12,14 @@
 
 Name:           libmtp
 Version:        0.1.5
-Release:        1%{?dist}
+Release:        2%{?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
@@ -54,6 +55,7 @@ library for MTP media players.
 
 %prep
 %setup -q
+%patch -p1 -b .udevrules
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 30 2007 Harald Hoyer <harald@redhat.com> - 0.1.5-2
+- changed udev rules for new kernel and udev versions
+
 * Mon Mar 26 2007 Linus Walleij <triad@df.lth.se> 0.1.5-1
 - New upstream release.
 - Candidate for FC5, FC6 backport.