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

[Jiří Popelka]

commit 66927175aace628bbccda53f55fefecef68e37fc
Merge: 037f4e9 df33be4
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 4 15:41:02 2012 +0200

    Merge branch 'f18'

 .gitignore               |    1 +
 hplip-3.12.10.tar.gz.asc |    7 +++++++
 hplip-3.12.9.tar.gz.asc  |    7 -------
 hplip-cron-locale.patch  |   12 ------------
 hplip.spec               |   11 +++++------
 sources                  |    2 +-
 6 files changed, 14 insertions(+), 26 deletions(-)
---
diff --cc hplip.spec
index 0fff27c,2c1945d..aa9f55b
--- a/hplip.spec
+++ b/hplip.spec
@@@ -38,9 -38,7 +38,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
- Patch33: hplip-cron-locale.patch
  
  Requires(pre): /sbin/service
  Requires(post): /sbin/chkconfig
@@@ -290,15 -288,9 +289,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
  
- # hplip_cron only works with english locale (Launchpad #1054584)
- %patch33 -p1 -b .hplip-cron-locale.patch
- 
  sed -i.duplex-constraints \
      -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
      prnt/drv/hpcups.drv.in