diff --git a/hplip-top-margins-not-respected.patch b/hplip-top-margins-not-respected.patch new file mode 100644 index 0000000..c11426c --- /dev/null +++ b/hplip-top-margins-not-respected.patch @@ -0,0 +1,22 @@ +diff -up hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected 2011-10-02 05:03:50.000000000 +0200 ++++ hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp 2011-11-14 16:49:39.073220429 +0100 +@@ -544,18 +544,10 @@ bool HPCupsFilter::isBlankRaster(BYTE *i + return true; + } + +- if(header->cupsColorSpace == CUPS_CSPACE_K){ +- if (*input_raster == 0x00 && +- !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { +- return true; +- } +- } +- else{ + if (*input_raster == 0xFF && + !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) { + return true; + } +- } + return false; + } + diff --git a/hplip.spec b/hplip.spec index fe9a301..89358c9 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.11.10 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -48,6 +48,7 @@ Patch34: hplip-notification-exception.patch Patch35: hplip-CVE-2010-4267.patch Patch36: hplip-wifisetup.patch Patch37: hplip-hpaio-localonly.patch +Patch38: hplip-top-margins-not-respected.patch Requires(pre): /sbin/service Requires(post): /sbin/chkconfig @@ -305,6 +306,9 @@ done # 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). +%patch38 -p1 -b .top-margins-not-respected + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -531,6 +535,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed Nov 16 2011 Jiri Popelka 3.11.10-8 +- revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089). + * Wed Oct 26 2011 Fedora Release Engineering - 3.11.10-7 - Rebuilt for glibc bug#747377