diff --git a/libmtp-0.2.6.1-simpler-rules.patch b/libmtp-0.2.6.1-simpler-rules.patch new file mode 100644 index 0000000..0f7c033 --- /dev/null +++ b/libmtp-0.2.6.1-simpler-rules.patch @@ -0,0 +1,28 @@ +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"); + } + diff --git a/libmtp.spec b/libmtp.spec index 13e88c6..2b8e14f 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -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 @@ Requires: hal 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 @@ library for MTP media players. %prep %setup -q +%patch0 -p1 -b .rules %build %configure --disable-static --program-prefix=mtp- @@ -108,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 23 2008 Adam Jackson 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 0.2.6.1-1 - New upstream bugfix release.