rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Import modules we catch exceptions from (bug #574117).

Browse Source
This commit is contained in:
Tim Waugh 2010-03-16 18:06:38 +00:00
parent 3ea06bff64
commit 7086cd2df2
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
system-config-printer-missing-imports.patch Normal file
View File

@ -0,0 +1,34 @@
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@redhat.com>
+## Copyright (C) 2008, 2009, 2010 Red Hat, Inc.
+## Authors:
+## Tim Waugh <twaugh@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

9
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.93
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -23,6 +23,7 @@ Patch3: system-config-printer-import-gobject.patch
Patch4: system-config-printer-check-install.patch
Patch5: system-config-printer-icon-name.patch
Patch6: system-config-printer-cupsconnection-dealloc.patch
Patch7: system-config-printer-missing-imports.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@ -99,6 +100,9 @@ printers.
# Fix pycups Connection_dealloc()
%patch6 -p1 -b .cupsconnection-dealloc
# Import modules we catch exceptions from (bug #574117).
%patch7 -p1 -b .missing-imports
%build
%configure --with-udev-rules --with-polkit-1
@ -214,6 +218,9 @@ rm -rf %buildroot
exit 0
%changelog
* Tue Mar 16 2010 Tim Waugh <twaugh@redhat.com> - 1.1.93-7
- Import modules we catch exceptions from (bug #574117).
* Mon Mar 8 2010 Jiri Popelka <jpopelka@redhat.com> 1.1.93-6
- Fixed pycups to be more cautious when removing
the Connection object from the list (bug #567386).