diff --git a/hplip-IEEE-1284-4.patch b/hplip-IEEE-1284-4.patch new file mode 100644 index 0000000..022f9f8 --- /dev/null +++ b/hplip-IEEE-1284-4.patch @@ -0,0 +1,23 @@ +diff -up hplip-3.12.9/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.9/io/hpmud/musb.c +--- hplip-3.12.9/io/hpmud/musb.c.hplip-IEEE-1284-4 2012-09-04 14:33:58.000000000 +0200 ++++ hplip-3.12.9/io/hpmud/musb.c 2012-09-20 10:11:53.759116729 +0200 +@@ -708,7 +708,8 @@ static libusb_device *get_libusb_device( + { + if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */ + (altptr->bInterfaceSubClass == 1) && +- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/ ++ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2 ++ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */ + { + if (is_uri(dev, uri)) + { +@@ -2061,7 +2062,8 @@ int __attribute__ ((visibility ("hidden" + { + if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */ + (altptr->bInterfaceSubClass == 1) && +- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/ ++ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2 ++ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */ + { + libusb_open(dev, &hd); + if (hd == NULL) diff --git a/hplip.spec b/hplip.spec index 5f68871..59ca803 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.12.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -44,6 +44,7 @@ Patch28: hplip-wifisetup.patch Patch29: hplip-makefile-chgrp.patch Patch30: hplip-hpaio-localonly.patch Patch31: hplip-ipp-accessors.patch +Patch32: hplip-IEEE-1284-4.patch Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -296,6 +297,9 @@ done # To build against CUPS-1.6 (launchpad #1026666) %patch31 -p1 -b .ipp-accessors +# Support IEEE 1284.4 protocol over USB (bug #858861). +%patch32 -p1 -b .hplip-IEEE-1284-4 + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -532,6 +536,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Thu Sep 20 2012 Jiri Popelka 3.12.9-3 +- Support IEEE 1284.4 protocol over USB (bug #858861). + * Fri Sep 07 2012 Jiri Popelka 3.12.9-2 - build against CUPS-1.6