rpms/system-config-printer/devel system-config-printer-auto_make.patch, NONE, 1.1 system-config-printer.spec, 1.395, 1.396

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14464

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-auto_make.patch 
Log Message:
* Wed Jun 02 2010 Jiri Popelka <jpopelka at redhat.com> 1.2.2-4
- Initialise auto_make to the empty string (bug #590193).


system-config-printer-auto_make.patch:
 system-config-printer.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-auto_make.patch ---
diff -up system-config-printer-1.2.2/system-config-printer.py.auto_make system-config-printer-1.2.2/system-config-printer.py
--- system-config-printer-1.2.2/system-config-printer.py.auto_make	2010-05-07 16:19:03.000000000 +0200
+++ system-config-printer-1.2.2/system-config-printer.py	2010-06-02 18:15:16.000000000 +0200
@@ -4111,8 +4111,8 @@ class NewPrinterGUI(GtkGUI):
             self.on_rbtnNPFoomatic_toggled(self.rbtnNPFoomatic)
             self.rbtnChangePPDKeepSettings.set_active(True)
 
-            self.auto_make = None
-            self.auto_model = None
+            self.auto_make = ""
+            self.auto_model = ""
             self.auto_driver = None
             ppd = self.mainapp.ppd
             #self.mainapp.devid = "MFG:Samsung;MDL:ML-3560;DES:;CMD:GDI;"
@@ -4319,7 +4319,7 @@ class NewPrinterGUI(GtkGUI):
                 self.dialog_mode == "printer_with_uri":
             self.busy (self.NewPrinterWindow)
             if page_nr == 1: # Device (first page)
-                self.auto_make, self.auto_model = None, None
+                self.auto_make, self.auto_model = "", ""
                 self.auto_driver = None
                 self.device.uri = self.getDeviceURI()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -p -r1.395 -r1.396
--- system-config-printer.spec	18 May 2010 13:54:33 -0000	1.395
+++ system-config-printer.spec	2 Jun 2010 16:24:07 -0000	1.396
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-cupspk-fileget-tmp.patch
+Patch3: system-config-printer-auto_make.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -84,6 +85,9 @@ printers.
 # (bug #587744).
 %patch2 -p1 -b .cupspk-fileget-tmp
 
+#Initialise auto_make to the empty string (bug #590193).
+%patch3 -p1 -b .auto_make
+
 %build
 %configure --with-udev-rules
 
@@ -200,6 +204,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Jun 02 2010 Jiri Popelka <jpopelka at redhat.com> 1.2.2-4
+- Initialise auto_make to the empty string (bug #590193).
+
 * Tue May 18 2010 Tim Waugh <twaugh at redhat.com> - 1.2.2-3
 - Updated pycups to 1.9.50.
 - Updated pysmbc to 1.0.7.