rpms/system-config-printer/devel system-config-printer-copy-printer.patch, NONE, 1.1 system-config-printer.spec, 1.348, 1.349

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25551

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-copy-printer.patch 
Log Message:
* Thu Jan 21 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-2
- Fixed traceback when renaming a printer.


system-config-printer-copy-printer.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-copy-printer.patch ---
diff -up system-config-printer-1.1.90/system-config-printer.py.copy-printer system-config-printer-1.1.90/system-config-printer.py
--- system-config-printer-1.1.90/system-config-printer.py.copy-printer	2010-01-19 13:06:19.000000000 +0000
+++ system-config-printer-1.1.90/system-config-printer.py	2010-01-21 14:45:33.668150157 +0000
@@ -3058,7 +3058,7 @@ class GUI(GtkGUI, monitor.Watcher):
                 self.cups._end_operation ()
                 return
 
-        if self.copy_printer (new_name):
+        if self.duplicate_printer (new_name):
             # Failure.
             self.monitor.update ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- system-config-printer.spec	19 Jan 2010 14:49:45 -0000	1.348
+++ system-config-printer.spec	21 Jan 2010 14:47:04 -0000	1.349
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-copy-printer.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .copy-printer
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -191,6 +193,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Jan 21 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-2
+- Fixed traceback when renaming a printer.
+
 * Tue Jan 19 2010 Tim Waugh <twaugh at redhat.com> - 1.1.90-1
 - 1.1.90 development release.