From e28b1653aec56f291ef34ece03f2c17b4fc92d81 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 16 Jul 2007 17:21:04 +0000 Subject: [PATCH] - Low ink is a warning condition, not an error. --- hplip-marker-supply.patch | 16 ++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 hplip-marker-supply.patch diff --git a/hplip-marker-supply.patch b/hplip-marker-supply.patch new file mode 100644 index 0000000..dc4ce92 --- /dev/null +++ b/hplip-marker-supply.patch @@ -0,0 +1,16 @@ +--- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply 2007-07-16 18:19:31.000000000 +0100 ++++ hplip-2.7.6/prnt/hpijs/hpijs.cpp 2007-07-16 18:19:43.000000000 +0100 +@@ -534,11 +534,11 @@ + case WARN_LOW_INK_YELLOW: + case WARN_LOW_INK_MULTIPLE_PENS: + { +- bug ("STATE: marker-supply-low\n"); ++ bug ("STATE: marker-supply-low-warning\n"); + break; + } + default: +- bug ("STATE: -marker-supply-low"); ++ bug ("STATE: -marker-supply-low-warning"); + } + } + diff --git a/hplip.spec b/hplip.spec index 433fd62..79065f2 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 2.7.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -17,6 +17,7 @@ Patch0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-2.7.6-1.patch Patch1: hplip-desktop.patch Patch2: hplip-guest.patch Patch3: hplip-quiet.patch +Patch4: hplip-marker-supply.patch Patch5: hplip-libm.patch Patch8: hplip-libsane.patch Patch9: hplip-media-empty.patch @@ -95,6 +96,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Quieten hpssd on startup. %patch3 -p1 -b .quiet +# Low ink is a warning condition, not an error. +%patch4 -p1 -b .marker-supply + # libhpip should link against libm (bug #197599). %patch5 -p1 -b .libm @@ -265,6 +269,9 @@ fi exit 0 %changelog +* Mon Jul 16 2007 Tim Waugh 2.7.6-7 +- Low ink is a warning condition, not an error. + * Wed Jul 11 2007 Tim Waugh 2.7.6-6 - Add hp-check back, but in the gui sub-package. - Show the HP Toolbox menu entry again.