rpms/libmtp/devel libmtp-0.2.6.1-simpler-rules.patch, NONE, 1.1 libmtp.spec, 1.19, 1.20

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318

Modified Files:
	libmtp.spec 
Added Files:
	libmtp-0.2.6.1-simpler-rules.patch 
Log Message:
* Fri May 23 2008 Adam Jackson <ajax at redhat.com> 0.2.6.1-2
- libmtp-0.2.6.1-simpler-rules.patch: Simplify udev rules for faster bootup.


libmtp-0.2.6.1-simpler-rules.patch:

--- NEW FILE libmtp-0.2.6.1-simpler-rules.patch ---
diff -up libmtp-0.2.6.1/examples/hotplug.c.jx libmtp-0.2.6.1/examples/hotplug.c
--- libmtp-0.2.6.1/examples/hotplug.c.jx	2007-11-10 19:06:28.000000000 -0500
+++ libmtp-0.2.6.1/examples/hotplug.c	2008-05-23 11:06:12.000000000 -0400
@@ -93,7 +93,7 @@ int main (int argc, char **argv)
       printf("ATTR{dev}!=\"?*\", GOTO=\"libmtp_rules_end\"\n");
       printf("SUBSYSTEM==\"usb\", GOTO=\"libmtp_usb_rules\"\n"
 	     "# The following thing will be deprecated when older kernels are phased out.\n"
-             "SUBSYSTEM==\"usb_device\", GOTO=\"libmtp_usb_device_rules\"\n"
+             "SUBSYSTEM==\"usb_device\", GOTO=\"libmtp_usb_rules\"\n"
 	     "GOTO=\"libmtp_rules_end\"\n\n"
 	     "LABEL=\"libmtp_usb_rules\"\n\n");
       break;
@@ -182,6 +182,7 @@ int main (int argc, char **argv)
   // For backward comparibility with the #$!+@! ever changing
   // udev rule style...
   if (style == style_udev) {
+#if 0
     printf("GOTO=\"libmtp_rules_end\"\n\n");
     printf("LABEL=\"libmtp_usb_device_rules\"\n");
     for (i = 0; i < numentries; i++) {
@@ -190,6 +191,7 @@ int main (int argc, char **argv)
       printf("# %s %s\n", entry->vendor, entry->product);
       printf("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", %s\n", entry->vendor_id, entry->product_id, action); 
     }
+#endif
     printf("GOTO=\"libmtp_rules_end\"\n\n");
   }
 


Index: libmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libmtp.spec	7 Mar 2008 23:32:23 -0000	1.19
+++ libmtp.spec	23 May 2008 15:21:01 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        0.2.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -18,6 +18,8 @@
 BuildRequires:  libusb-devel
 BuildRequires:  doxygen
 
+Patch0: libmtp-0.2.6.1-simpler-rules.patch
+
 %description
 This package provides a software library for communicating with MTP
 (Media Transfer Protocol) media players, typically audio players, video
@@ -45,6 +47,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .rules
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -108,6 +111,9 @@
 
 
 %changelog
+* Fri May 23 2008 Adam Jackson <ajax at redhat.com> 0.2.6.1-2
+- libmtp-0.2.6.1-simpler-rules.patch: Simplify udev rules for faster bootup.
+
 * Sat Mar 8 2008 Linus Walleij <triad at df.lth.se> 0.2.6.1-1
 - New upstream bugfix release.