rpms/hplip/F-12 hplip-skip-blank-lines.patch, NONE, 1.1 hplip.spec, 1.259, 1.260

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7500

Modified Files:
	hplip.spec 
Added Files:
	hplip-skip-blank-lines.patch 
Log Message:
* Thu Apr 15 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.2-5
- Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461).


hplip-skip-blank-lines.patch:
 Encapsulator.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hplip-skip-blank-lines.patch ---
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;
 }


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -p -r1.259 -r1.260
--- hplip.spec	7 Apr 2010 15:23:05 -0000	1.259
+++ hplip.spec	15 Apr 2010 15:34:38 -0000	1.260
@@ -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 <jpopelka at redhat.com> - 3.10.2-5
+- Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461).
+
 * Wed Apr  7 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-4
 - Regenerate hpcups PPDs on upgrade if necessary (bug #579355).