rpms/hplip/devel hplip-faxing-with-low-supplies.patch, NONE, 1.1 hplip.spec, 1.125, 1.126
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri May 4 16:40:27 UTC 2007
- Previous message (by thread): rpms/kernel-xen-2.6/devel .cvsignore, 1.4.2.1, 1.4.2.2 kernel-xen.spec, 1.20.2.5, 1.20.2.6 sources, 1.4.2.1, 1.4.2.2 xen-version-strings.patch, 1.2.2.1, 1.2.2.2
- Next message (by thread): rpms/perl/devel perl.spec,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28264
Modified Files:
hplip.spec
Added Files:
hplip-faxing-with-low-supplies.patch
Log Message:
* Fri May 4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-9
- When faxing, low ink/paper is not a problem (bug #238664).
- Resolves: rhbz#238664
hplip-faxing-with-low-supplies.patch:
sendfax.py | 2 +-
ui/faxsendjobform.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE hplip-faxing-with-low-supplies.patch ---
--- hplip-1.7.2/sendfax.py.faxing-with-low-supplies 2007-02-27 22:30:34.000000000 +0000
+++ hplip-1.7.2/sendfax.py 2007-05-04 17:38:44.000000000 +0100
@@ -654,7 +654,7 @@
log.error("Query device error (%s)." % e.msg)
dev.error_state = ERROR_STATE_ERROR
- if dev.error_state > ERROR_STATE_MAX_OK:
+ if dev.error_state > ERROR_STATE_MAX_OK and dev.error_state != ERROR_STATE_LOW_SUPPLIES and dev.error_state != ERROR_STATE_LOW_PAPER:
log.error("Device is busy or in an error state (code=%d). Please wait for the device to become idle or clear the error and try again." % dev.error_state)
sys.exit(1)
--- hplip-1.7.2/ui/faxsendjobform.py.faxing-with-low-supplies 2007-02-28 22:35:18.000000000 +0000
+++ hplip-1.7.2/ui/faxsendjobform.py 2007-05-04 17:38:51.000000000 +0100
@@ -544,7 +544,7 @@
QApplication.restoreOverrideCursor()
- if self.dev.error_state > ERROR_STATE_MAX_OK:
+ if self.dev.error_state > ERROR_STATE_MAX_OK and self.dev.error_state != ERROR_STATE_LOW_SUPPLIES and self.dev.error_state != ERROR_STATE_LOW_PAPER:
self.FailureUI(self.__tr("<b>Device is busy or in an error state (code=%1)</b><p>Please wait for the device to become idle or clear the error and try again.").arg(self.dev.status_code))
return
Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- hplip.spec 17 Apr 2007 08:50:36 -0000 1.125
+++ hplip.spec 4 May 2007 16:40:24 -0000 1.126
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 1.7.2
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPL/MIT/BSD
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -22,6 +22,7 @@
Patch7: hplip-marker-supply.patch
Patch8: hplip-libsane.patch
Patch9: hplip-media-empty.patch
+Patch10: hplip-faxing-with-low-supplies.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires(post): /sbin/service
@@ -108,6 +109,9 @@
# Clear the media-empty-error printer state.
%patch9 -p1 -b .media-empty
+# When faxing, low ink/paper is not a problem (bug #238664).
+%patch10 -p1 -b .faxing-with-low-supplies
+
autoconf # for patch4
%build
@@ -283,6 +287,9 @@
exit 0
%changelog
+* Fri May 4 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-9
+- When faxing, low ink/paper is not a problem (bug #238664).
+
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-8
- Update desktop database on %%postun as well (bug #236163).
- Previous message (by thread): rpms/kernel-xen-2.6/devel .cvsignore, 1.4.2.1, 1.4.2.2 kernel-xen.spec, 1.20.2.5, 1.20.2.6 sources, 1.4.2.1, 1.4.2.2 xen-version-strings.patch, 1.2.2.1, 1.2.2.2
- Next message (by thread): rpms/perl/devel perl.spec,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list