rpms/hplip/F-12 hplip-bad-state-attr.patch, NONE, 1.1 hplip.spec, 1.269, 1.270

[Tim Waugh]

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-bad-state-attr.patch 
Log Message:
* Thu Jun 17 2010 Tim Waugh <twaugh at redhat.com> - 3.10.5-5
- Fixed marker-supply attributes in hpijs (bug #605269).


hplip-bad-state-attr.patch:
 hpijs.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hplip-bad-state-attr.patch ---
diff -up hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr hplip-3.10.5/prnt/hpijs/hpijs.cpp
--- hplip-3.10.5/prnt/hpijs/hpijs.cpp.bad-state-attr	2010-06-17 15:11:53.417989598 +0100
+++ hplip-3.10.5/prnt/hpijs/hpijs.cpp	2010-06-17 15:28:41.169989632 +0100
@@ -666,11 +666,11 @@ int main (int argc, char *argv[], char *
 			case WARN_LOW_INK_YELLOW:
 			case WARN_LOW_INK_MULTIPLE_PENS:
                         {
-			   BUG ("STATE: +marker-supply-low-warning\n");
+			   fputs("STATE: +marker-supply-low-warning\n", stderr);
                            break;
                         }
 			default:
-			   BUG ("STATE: -marker-supply-low-warning\n");
+			   fputs("STATE: -marker-supply-low-warning\n", stderr);
 		}
     }
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- hplip.spec	9 Jun 2010 15:50:36 -0000	1.269
+++ hplip.spec	17 Jun 2010 15:01:45 -0000	1.270
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch8: hplip-retry-open.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-clear-old-state-reasons.patch
+Patch13: hplip-bad-state-attr.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch16: hplip-bad-low-ink-warning.patch
 Patch17: hplip-skip-blank-lines.patch
@@ -159,6 +160,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Clear old printer-state-reasons we used to manage (bug #510926).
 %patch12 -p1 -b .clear-old-state-reasons
 
+# Fixed marker-supply attributes in hpijs (bug #605269).
+%patch13 -p1 -b .bad-state-attr
+
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
@@ -408,6 +412,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Thu Jun 17 2010 Tim Waugh <twaugh at redhat.com> - 3.10.5-5
+- Fixed marker-supply attributes in hpijs (bug #605269).
+
 * Wed Jun  9 2010 Tim Waugh <twaugh at redhat.com> - 3.10.5-4
 - Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825).