rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f17' into f18

Browse Source
This commit is contained in:
Jiri Popelka 2012-09-20 10:14:58 +02:00
commit 88afb24e64
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hplip-IEEE-1284-4.patch Normal file
View File

@ -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)

8
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.12.9
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -43,6 +43,7 @@ Patch27: hplip-CVE-2010-4267.patch
Patch28: hplip-wifisetup.patch
Patch29: hplip-makefile-chgrp.patch
Patch30: hplip-hpaio-localonly.patch
Patch31: hplip-IEEE-1284-4.patch
Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig
@ -292,6 +293,8 @@ done
# Pay attention to the SANE localOnly flag in hpaio (bug #743593).
%patch30 -p1 -b .hpaio-localonly
# Support IEEE 1284.4 protocol over USB (bug #858861).
%patch31 -p1 -b .hplip-IEEE-1284-4
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@ -529,6 +532,9 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
* Thu Sep 20 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-2
- Support IEEE 1284.4 protocol over USB (bug #858861).
* Fri Sep 07 2012 Jiri Popelka <jpopelka@redhat.com> 3.12.9-1
- 3.12.9
-- no longer needed: fax-ppd.patch