rpms/system-config-printer/F-11 system-config-printer-missing-imports.patch, NONE, 1.1 system-config-printer.spec, 1.350, 1.351

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-missing-imports.patch 
Log Message:
* Tue Mar 16 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-2
- Import modules we catch exceptions from (bug #574117).


system-config-printer-missing-imports.patch:
 AdvancedServerSettings.py |    6 ++++--
 jobviewer.py              |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-missing-imports.patch ---
diff -up system-config-printer-1.1.18/AdvancedServerSettings.py.missing-imports system-config-printer-1.1.18/AdvancedServerSettings.py
--- system-config-printer-1.1.18/AdvancedServerSettings.py.missing-imports	2010-03-10 09:33:45.000000000 +0000
+++ system-config-printer-1.1.18/AdvancedServerSettings.py	2010-03-16 17:30:11.388600957 +0000
@@ -2,8 +2,9 @@
 
 ## system-config-printer
 
-## Copyright (C) 2008, 2009 Red Hat, Inc.
-## Copyright (C) 2008, 2009 Tim Waugh <twaugh at redhat.com>
+## Copyright (C) 2008, 2009, 2010 Red Hat, Inc.
+## Authors:
+##  Tim Waugh <twaugh at redhat.com>
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,6 +21,7 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from gettext import gettext as _
+import cups
 import gobject
 import gtk
 import os
diff -up system-config-printer-1.1.18/jobviewer.py.missing-imports system-config-printer-1.1.18/jobviewer.py
--- system-config-printer-1.1.18/jobviewer.py.missing-imports	2010-03-10 09:33:45.000000000 +0000
+++ system-config-printer-1.1.18/jobviewer.py	2010-03-16 17:30:11.398601208 +0000
@@ -23,6 +23,7 @@ import dbus.glib
 import dbus.service
 import pynotify
 import gettext
+import glib
 import gobject
 import gtk
 import gtk.gdk


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -p -r1.350 -r1.351
--- system-config-printer.spec	10 Mar 2010 10:43:13 -0000	1.350
+++ system-config-printer.spec	16 Mar 2010 17:45:37 -0000	1.351
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-missing-imports.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,9 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 
+# Import modules we catch exceptions from (bug #574117).
+%patch1 -p1 -b .missing-imports
+
 %build
 %configure
 
@@ -168,6 +173,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue Mar 16 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-2
+- Import modules we catch exceptions from (bug #574117).
+
 * Wed Mar 10 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-1
 - Updated to pycups-1.9.49.
 - 1.1.18: