diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch new file mode 100644 index 0000000..a301b9b --- /dev/null +++ b/hplip-skip-blank-lines.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines hplip-3.10.2/prnt/hpcups/Encapsulator.cpp +--- hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Encapsulator.cpp 2010-04-15 17:15:03.000000000 +0200 +@@ -191,7 +191,7 @@ DRIVER_ERROR Encapsulator::SendCAPy(int + { + DRIVER_ERROR err = NO_ERROR; + char str[12]; +- sprintf(str, "\x1b*b%dY", iOffset); ++ sprintf(str, "\x1b*p%dY", iOffset); + err = this->Send ((const BYTE *) str, strlen(str)); + return err; + } diff --git a/hplip.spec b/hplip.spec index 97f1200..02dbbcb 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch +Patch17: hplip-skip-blank-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -154,6 +155,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). %patch16 -p1 -b .bad-low-ink-warning +# Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). +%patch17 -p1 -b .skip-blank-lines + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -374,6 +378,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Apr 15 2010 Jiri Popelka - 3.10.2-5 +- Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). + * Wed Apr 7 2010 Tim Waugh - 3.10.2-4 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355).