rpms/hal-cups-utils/devel hal-cups-utils-no-compare-queue-name.patch, 1.1, 1.2 hal-cups-utils.spec, 1.68, 1.69

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9661

Modified Files:
	hal-cups-utils-no-compare-queue-name.patch hal-cups-utils.spec 
Log Message:
Missed a bit of the patch.

hal-cups-utils-no-compare-queue-name.patch:

Index: hal-cups-utils-no-compare-queue-name.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils-no-compare-queue-name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hal-cups-utils-no-compare-queue-name.patch	4 Apr 2008 16:49:01 -0000	1.1
+++ hal-cups-utils-no-compare-queue-name.patch	4 Apr 2008 17:07:28 -0000	1.2
@@ -1,17 +1,18 @@
 diff -U0 hal-cups-utils-0.6.16/ChangeLog.no-compare-queue-name hal-cups-utils-0.6.16/ChangeLog
 --- hal-cups-utils-0.6.16/ChangeLog.no-compare-queue-name	2008-03-25 12:30:03.000000000 +0000
-+++ hal-cups-utils-0.6.16/ChangeLog	2008-04-04 17:47:05.000000000 +0100
-@@ -0,0 +1,7 @@
++++ hal-cups-utils-0.6.16/ChangeLog	2008-04-04 18:06:45.000000000 +0100
+@@ -0,0 +1,8 @@
 +2008-04-04  Tim Waugh  <twaugh at redhat.com>
 +
 +	* systemv/hal_lpadmin (HalPrinter.add): Don't compare queue names
 +	to find out if this device already has a queue configured, just
 +	URIs.
 +	(HalPrinter.add): Make the name unique.
++	(HalPrinter.add): Deal with fax names as well.
 +
 diff -up hal-cups-utils-0.6.16/systemv/hal_lpadmin.no-compare-queue-name hal-cups-utils-0.6.16/systemv/hal_lpadmin
 --- hal-cups-utils-0.6.16/systemv/hal_lpadmin.no-compare-queue-name	2008-03-25 12:30:03.000000000 +0000
-+++ hal-cups-utils-0.6.16/systemv/hal_lpadmin	2008-04-04 17:47:05.000000000 +0100
++++ hal-cups-utils-0.6.16/systemv/hal_lpadmin	2008-04-04 18:06:45.000000000 +0100
 @@ -213,8 +213,8 @@ class HalPrinter:
          p = None
          for name, printer in printers.iteritems():
@@ -23,7 +24,18 @@
                  syslog (LOG_DEBUG,
                          "Not adding printer: %s already exists" % name)
                  printer_exists = 1
-@@ -249,6 +249,15 @@ class HalPrinter:
+@@ -230,9 +230,7 @@ class HalPrinter:
+                         syslog (LOG_INFO,
+                                 "Printer %s exists but is disabled, reason: %s; "
+                                 "use 'cupsenable %s' to enable it" % (name, statemsg, name))
+-            if (faxuris and
+-                (name == self.faxname or
+-                 printer.device_uri in faxuris)):
++            if faxuris and printer.device_uri in faxuris:
+                 syslog (LOG_DEBUG,
+                         "Not adding fax printer: %s already exists" % name)
+                 fax_exists = 1
+@@ -249,6 +247,24 @@ class HalPrinter:
                                  "Fax printer %s exists but is disabled, reason: %s; "
                                  "use 'cupsenable %s' to enable it" % (name, statemsg, name))
  
@@ -36,6 +48,15 @@
 +                    break
 +            self.name += str (suffix)
 +
++        # Make the faxname unique
++        if self.faxname in printers.keys ():
++            suffix = 2
++            while (self.faxname + str (suffix)) in printers.keys ():
++                suffix += 1
++                if suffix == 100:
++                    break
++            self.faxname += str (suffix)
++
          def wait_child (sig, stack):
              (pid, status) = os.wait ()
  


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- hal-cups-utils.spec	4 Apr 2008 16:49:01 -0000	1.68
+++ hal-cups-utils.spec	4 Apr 2008 17:07:28 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -60,7 +60,7 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
-* Fri Apr  4 2008 Tim Waugh <twaugh at redhat.com> 0.6.16-2
+* Fri Apr  4 2008 Tim Waugh <twaugh at redhat.com> 0.6.16-3
 - Applied patch from upstream to use only the device URI to see if the
   printer has been configured already, and to make the queue name unique.