rpms/system-config-printer/F-11 system-config-printer-select-nonexistent-printer.patch, 1.1, 1.2 system-config-printer.spec, 1.326, 1.327

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer-select-nonexistent-printer.patch 
	system-config-printer.spec 
Log Message:
* Thu Jan  7 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-5
- Fixed typo introduced in recent fix (bug #551436).
- Use %global instead of %define.


system-config-printer-select-nonexistent-printer.patch:
 system-config-printer.py |    7 +++++++
 1 file changed, 7 insertions(+)

Index: system-config-printer-select-nonexistent-printer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer-select-nonexistent-printer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-select-nonexistent-printer.patch	6 Jan 2010 15:50:00 -0000	1.1
+++ system-config-printer-select-nonexistent-printer.patch	7 Jan 2010 13:07:34 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.16/system-config-printer.py.select-nonexistent-printer system-config-printer-1.1.16/system-config-printer.py
---- system-config-printer-1.1.16/system-config-printer.py.select-nonexistent-printer	2010-01-06 15:46:02.056410131 +0000
-+++ system-config-printer-1.1.16/system-config-printer.py	2010-01-06 15:46:54.226408979 +0000
+--- system-config-printer-1.1.16/system-config-printer.py.select-nonexistent-printer	2010-01-07 12:42:21.062047874 +0000
++++ system-config-printer-1.1.16/system-config-printer.py	2010-01-07 12:42:33.235047115 +0000
 @@ -6896,6 +6896,8 @@ class NewPrinterGUI(GtkGUI):
                      self.mainapp.cups.addPrinter(name, ppd=ppd)
                  except cups.IPPError, (e, msg):
@@ -14,7 +14,7 @@ diff -up system-config-printer-1.1.16/sy
  
              iter = model.iter_next (iter)
  
-+        if not self.printers.has_key (name):
++        if not self.mainapp.printers.has_key (name):
 +            # At this stage the printer has disappeared even though we
 +            # only added it moments ago.
 +            return


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -p -r1.326 -r1.327
--- system-config-printer.spec	6 Jan 2010 16:29:35 -0000	1.326
+++ system-config-printer.spec	7 Jan 2010 13:07:34 -0000	1.327
@@ -1,13 +1,13 @@
-%define pycups_version 1.9.47
-%define pysmbc_version 1.0.6
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%global pycups_version 1.9.47
+%global pysmbc_version 1.0.6
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -191,6 +191,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Jan  7 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-5
+- Fixed typo introduced in recent fix (bug #551436).
+- Use %%global instead of %%define.
+
 * Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
 - Fixed pycups IPPRequest attribute handling bug.
 - Make sure there are enough ink level values (bug #541882).