diff --git a/cups-usblp-quirks.patch b/cups-usblp-quirks.patch index c7f1cbf..59ecb0d 100644 --- a/cups-usblp-quirks.patch +++ b/cups-usblp-quirks.patch @@ -1,6 +1,6 @@ -diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c ---- cups-1.6.2/backend/usb-libusb.c.quirks 2013-03-14 15:31:07.000000000 +0100 -+++ cups-1.6.2/backend/usb-libusb.c 2013-05-23 10:44:34.456769834 +0200 +diff -up cups-1.6.2/backend/usb-libusb.c.usblp-quirks cups-1.6.2/backend/usb-libusb.c +--- cups-1.6.2/backend/usb-libusb.c.usblp-quirks 2013-03-14 14:31:07.000000000 +0000 ++++ cups-1.6.2/backend/usb-libusb.c 2013-06-25 09:25:35.941884975 +0100 @@ -142,8 +142,12 @@ static const struct quirk_printer_struct { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ @@ -14,7 +14,13 @@ diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 -@@ -158,6 +162,8 @@ static const struct quirk_printer_struct +@@ -154,10 +158,14 @@ static const struct quirk_printer_struct + Printer, https://bugs.launchpad.net/bugs/1032456 */ + { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510 + Printer, https://bugs.launchpad.net/bugs/1050009 */ ++ { 0x04a9, 0x1730, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP540 ++ Printer, https://bugzilla.redhat.com/967873 */ + { 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155 */ @@ -23,7 +29,7 @@ diff -up cups-1.6.2/backend/usb-libusb.c.quirks cups-1.6.2/backend/usb-libusb.c { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695 */ -@@ -165,24 +171,33 @@ static const struct quirk_printer_struct +@@ -165,24 +173,33 @@ static const struct quirk_printer_struct USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253 */ diff --git a/cups.spec b/cups.spec index d144a20..9fb3c27 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.6.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -230,7 +230,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch27 -p1 -b .avahi-address # More USB quirks for the libusb-based backend (STR #4311). # Fixed in 1.6.3 -%patch28 -p1 -b .quirks +# Added usblp quirk for Canon PIXMA MP540 (bug #967873). +%patch28 -p1 -b .usblp-quirks # Return from cupsEnumDests() once all records have been returned. %patch29 -p1 -b .enum-all # Prevent stringpool damage leading to memory leaks (bug #974048). @@ -638,6 +639,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Jun 25 2013 Tim Waugh 1:1.6.2-11 +- Added usblp quirk for Canon PIXMA MP540 (bug #967873). + * Tue Jun 18 2013 Tim Waugh 1:1.6.2-10 - Added IEEE 1284 Device ID for a Dymo device (bug #747866).