[hplip/f16: 3/3] Merge branch 'f15' into f16

[Jiří Popelka]

commit 3da311d3e2bf3e4047f903f977570c44252ba06a
Merge: fb86ba7 be89e78
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Nov 16 16:03:48 2011 +0100

    Merge branch 'f15' into f16

 hplip-top-margins-not-respected.patch |   22 ++++++++++++++++++++++
 hplip.spec                            |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --cc hplip.spec
index fe9a301,0bc3ed1..89358c9
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.11.10
- Release: 7%{?dist}
 -Release: 6%{?dist}
++Release: 8%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -47,7 -47,7 +47,8 @@@ Patch33: hplip-dbus-threads.patc
  Patch34: hplip-notification-exception.patch
  Patch35: hplip-CVE-2010-4267.patch
  Patch36: hplip-wifisetup.patch
 -Patch37: hplip-top-margins-not-respected.patch
 +Patch37: hplip-hpaio-localonly.patch
++Patch38: hplip-top-margins-not-respected.patch
  
  Requires(pre): /sbin/service
  Requires(post): /sbin/chkconfig
@@@ -302,9 -302,9 +303,12 @@@ don
  # Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
  %patch36 -p1 -b .wifisetup
  
 +# Pay attention to the SANE localOnly flag in hpaio (bug #743593).
 +%patch37 -p1 -b .hpaio-localonly
 +
+ # revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
 -%patch37 -p1 -b .top-margins-not-respected
++%patch38 -p1 -b .top-margins-not-respected
+ 
  sed -i.duplex-constraints \
      -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
      prnt/drv/hpcups.drv.in
@@@ -531,15 -531,12 +535,18 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
++* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-8
+ - revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
+ 
 -* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.10-7
 +- Rebuilt for glibc bug#747377
 +
 +* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-6
  - Catch DBusException in hp-systray (bug #746024).
  
 +* Thu Oct 20 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +- Pay attention to the SANE localOnly flag in hpaio (bug #743593).
 +
  * Mon Oct 17 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-4
  - Corrected IEEE 1284 Device ID for LaserJet M1319f MFP (bug #746614)