rpms/hal-cups-utils/F-8 hal-cups-utils-no-disable.patch, NONE, 1.1 hal-cups-utils.spec, 1.63, 1.64

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20351

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-no-disable.patch 
Log Message:
* Thu Oct 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-2
- Don't disable printers that are unplugged (works around bug #352681 and
  bug #352691).


hal-cups-utils-no-disable.patch:

--- NEW FILE hal-cups-utils-no-disable.patch ---
diff -up hal-cups-utils-0.6.13/systemv/hal_lpadmin.no-disable hal-cups-utils-0.6.13/systemv/hal_lpadmin
--- hal-cups-utils-0.6.13/systemv/hal_lpadmin.no-disable	2007-10-25 17:29:36.000000000 +0100
+++ hal-cups-utils-0.6.13/systemv/hal_lpadmin	2007-10-25 17:33:08.000000000 +0100
@@ -305,6 +305,8 @@ class HalPrinter:
 
     def remove(self):
         syslog (LOG_DEBUG, "remove")
+        return
+
         # Disable all print queues which print to the device which
         # we detected as having been removed. This prevents from
         # jobs being retried every 30 seconds. The jobs wait in the


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-8/hal-cups-utils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- hal-cups-utils.spec	14 Sep 2007 15:32:53 -0000	1.63
+++ hal-cups-utils.spec	25 Oct 2007 16:42:11 -0000	1.64
@@ -1,11 +1,12 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
+Patch1: hal-cups-utils-no-disable.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -27,6 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%patch1 -p1 -b .no-disable
 
 %build
 
@@ -58,6 +60,10 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Thu Oct 25 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-2
+- Don't disable printers that are unplugged (works around bug #352681 and
+  bug #352691).
+
 * Fri Sep 14 2007 Tim Waugh <twaugh at redhat.com> 0.6.13-1
 - 0.6.13:
   - Enable/disable fix.