rpms/hplip/F-7 hplip-cmd_scan.patch, NONE, 1.1 hplip.spec, 1.140, 1.141

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7818

Modified Files:
	hplip.spec 
Added Files:
	hplip-cmd_scan.patch 
Log Message:
* Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).


hplip-cmd_scan.patch:

--- NEW FILE hplip-cmd_scan.patch ---
diff -up hplip-1.7.4a/base/utils.py.cmd_scan hplip-1.7.4a/base/utils.py
--- hplip-1.7.4a/base/utils.py.cmd_scan	2007-09-10 10:12:06.000000000 +0100
+++ hplip-1.7.4a/base/utils.py	2007-09-10 10:13:21.000000000 +0100
@@ -542,6 +542,7 @@ class UserSettings(object):
     
     def loadDefaults(self):
         # Print
+        self.cmd_print = ''
         path = which('hp-print')
     
         if len(path) > 0:
@@ -564,6 +565,7 @@ class UserSettings(object):
                         self.cmd_print = 'xpp -P%PRINTER%'
     
         # Scan
+        self.cmd_scan = ''
         path = which('xsane')
     
         if len(path) > 0:


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- hplip.spec	10 Sep 2007 09:07:33 -0000	1.140
+++ hplip.spec	10 Sep 2007 10:31:21 -0000	1.141
@@ -22,6 +22,7 @@
 Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
+Patch10: hplip-cmd_scan.patch
 Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -57,10 +58,6 @@
 Requires(postun): desktop-file-utils >= 0.2.92
 Requires: %{name} = %{version}-%{release}
 
-# hp-toolbox requires a graphical scanning program to be available
-# (bug #283291).
-Requires: xsane
-
 %description gui
 HPLIP graphical tools.
 
@@ -115,6 +112,9 @@
 # Clear the media-empty-error printer state.
 %patch9 -p1 -b .media-empty
 
+# Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
+%patch10 -p1 -b .cmd_scan
+
 # Prevent a traceback when unloading a photo card (bug #238617).
 %patch11 -p1 -b .unload-traceback
 
@@ -297,8 +297,7 @@
 
 %changelog
 * Mon Sep 10 2007 Tim Waugh <twaugh at redhat.com>
-- hp-toolbox requires a graphical scanning program to be available
-  (bug #283291).
+- Backported cmd_print/cmd_scan traceback fix from 2.7.7 (bug #283291).
 
 * Wed Jul 16 2007 Tim Waugh <twaugh at redhat.com>
 - Low ink is a warning condition, not an error.