[hplip: 4/4] Merge branch 'f18'

[Jiří Popelka]

commit 5288894969e733f0c552ab816a8ae5d5c084257c
Merge: 9a44012 88afb24
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Sep 20 10:16:46 2012 +0200

    Merge branch 'f18'

 hplip-IEEE-1284-4.patch |   23 +++++++++++++++++++++++
 hplip.spec              |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index 5f68871,cc6ef4c..59ca803
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -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
@@@ -43,7 -43,7 +43,8 @@@ Patch27: hplip-CVE-2010-4267.patc
  Patch28: hplip-wifisetup.patch
  Patch29: hplip-makefile-chgrp.patch
  Patch30: hplip-hpaio-localonly.patch
 -Patch31: hplip-IEEE-1284-4.patch
 +Patch31: hplip-ipp-accessors.patch
++Patch32: hplip-IEEE-1284-4.patch
  
  Requires(pre): /sbin/service
  Requires(post): /sbin/chkconfig
@@@ -293,9 -293,9 +294,12 @@@ don
  # Pay attention to the SANE localOnly flag in hpaio (bug #743593).
  %patch30 -p1 -b .hpaio-localonly
  
 +# To build against CUPS-1.6 (launchpad #1026666)
 +%patch31 -p1 -b .ipp-accessors
 +
+ # Support IEEE 1284.4 protocol over USB (bug #858861).
 -%patch31 -p1 -b .hplip-IEEE-1284-4
++%patch32 -p1 -b .hplip-IEEE-1284-4
+ 
  sed -i.duplex-constraints \
      -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
      prnt/drv/hpcups.drv.in
@@@ -532,9 -532,9 +536,12 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Thu Sep 20 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-2
++* Thu Sep 20 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-3
+ - Support IEEE 1284.4 protocol over USB (bug #858861).
+ 
 +* Fri Sep 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-2
 +- build against CUPS-1.6
 +
  * Fri Sep 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-1
  - 3.12.9
  -- no longer needed: fax-ppd.patch