rpms/hal-cups-utils/F-9 hal-cups-utils-dash.patch, NONE, 1.1 hal-cups-utils.spec, 1.70, 1.71

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-dash.patch 
Log Message:
* Mon May 12 2008 Tim Waugh <twaugh at redhat.com>
- Use dash instead of underscore when replacing disallowed characters in
  generated queue names (bug #445791).


hal-cups-utils-dash.patch:

--- NEW FILE hal-cups-utils-dash.patch ---
diff -U0 hal-cups-utils-0.6.16/ChangeLog.dash hal-cups-utils-0.6.16/ChangeLog
--- hal-cups-utils-0.6.16/ChangeLog.dash	2008-05-12 15:38:52.000000000 +0100
+++ hal-cups-utils-0.6.16/ChangeLog	2008-05-12 15:44:01.000000000 +0100
@@ -5,0 +6,2 @@
+	(HalPrinter.get_name): Use dash instead of underscore when
+	replacing disallowed characters (bug #445791).
diff -up hal-cups-utils-0.6.16/systemv/hal_lpadmin.dash hal-cups-utils-0.6.16/systemv/hal_lpadmin
--- hal-cups-utils-0.6.16/systemv/hal_lpadmin.dash	2008-05-12 15:38:52.000000000 +0100
+++ hal-cups-utils-0.6.16/systemv/hal_lpadmin	2008-05-12 15:44:01.000000000 +0100
@@ -78,9 +78,9 @@ class HalPrinter:
                               self.properties["usb.port_number"])
         else:
             name = self.model
-        name = name.replace(" ", "_")
-        name = name.replace("/", "_")
-        return name.replace("#", "_")
+        name = name.replace(" ", "-")
+        name = name.replace("/", "-")
+        return name.replace("#", "-")
 
     def get_cups_uris(self, removed=False):
         if self.uris != None:


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/F-9/hal-cups-utils.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- hal-cups-utils.spec	12 May 2008 14:39:07 -0000	1.70
+++ hal-cups-utils.spec	12 May 2008 15:03:54 -0000	1.71
@@ -8,6 +8,7 @@
 Source1: cups-config-daemon
 Patch1: hal-cups-utils-no-compare-queue-name.patch
 Patch2: hal-cups-utils-hal-fd.patch
+Patch3: hal-cups-utils-dash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -31,6 +32,7 @@
 %setup -q
 %patch1 -p1 -b .no-compare-queue-name
 %patch2 -p1 -b .hal-fd
+%patch3 -p1 -b .dash
 
 %build
 
@@ -63,6 +65,8 @@
 
 %changelog
 * Mon May 12 2008 Tim Waugh <twaugh at redhat.com>
+- Use dash instead of underscore when replacing disallowed characters in
+  generated queue names (bug #445791).
 - Explicitly set stdin to be /dev/null to avoid using HAL's file
   descriptor (bug #442191).