rpms/system-config-printer/F-9 system-config-printer-dash.patch, NONE, 1.1 system-config-printer.spec, 1.182, 1.183

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19670

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-dash.patch 
Log Message:
* Mon May 12 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.3-2
- Use dash instead of underscore when replacing disallowed characters in
  queue names (bug #445790).


system-config-printer-dash.patch:

--- NEW FILE system-config-printer-dash.patch ---
diff -up system-config-printer-0.7.82.3/system-config-printer.py.dash system-config-printer-0.7.82.3/system-config-printer.py
--- system-config-printer-0.7.82.3/system-config-printer.py.dash	2008-05-09 15:00:37.000000000 +0100
+++ system-config-printer-0.7.82.3/system-config-printer.py	2008-05-12 17:13:50.000000000 +0100
@@ -2271,9 +2271,9 @@ class GUI(GtkGUI):
     
     def makeNameUnique(self, name):
         """Make a suggested queue name valid and unique."""
-        name = name.replace (" ", "_")
-        name = name.replace ("/", "_")
-        name = name.replace ("#", "_")
+        name = name.replace (" ", "-")
+        name = name.replace ("/", "-")
+        name = name.replace ("#", "-")
         if not self.checkNPName (name):
             suffix=2
             while not self.checkNPName (name + str (suffix)):
diff -U0 system-config-printer-0.7.82.3/ChangeLog.dash system-config-printer-0.7.82.3/ChangeLog
--- system-config-printer-0.7.82.3/ChangeLog.dash	2008-05-09 15:00:37.000000000 +0100
+++ system-config-printer-0.7.82.3/ChangeLog	2008-05-12 17:14:12.000000000 +0100
@@ -0,0 +1,5 @@
+2008-05-12  Tim Waugh  <twaugh at redhat.com>
+
+	* system-config-printer.py (GUI.makeNameUnique): Use dash instead
+	of underscore when replacing disallowed characters (bug #445790).
+


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- system-config-printer.spec	9 May 2008 14:15:27 -0000	1.182
+++ system-config-printer.spec	12 May 2008 16:15:42 -0000	1.183
@@ -5,12 +5,13 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.82.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
 Source1: pycups-%{pycups_version}.tar.bz2
+Patch1: system-config-printer-dash.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q -a 1
+%patch1 -p1 -b .dash
 
 %build
 %configure
@@ -120,6 +122,10 @@
 exit 0
 
 %changelog
+* Mon May 12 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.3-2
+- Use dash instead of underscore when replacing disallowed characters in
+  queue names (bug #445790).
+
 * Fri May  9 2008 Tim Waugh <twaugh at redhat.com> 0.7.82.3-1
 - No longer requires system-install-packages (bug #444645).
 - 0.7.82.3: