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

Merge branch 'f20' into f21

Browse Source
This commit is contained in:
Tim Waugh 2014-07-11 17:30:21 +01:00
commit aa20407706
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
system-config-printer-permission.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up system-config-printer-1.4.5/system-config-printer.py.permission system-config-printer-1.4.5/system-config-printer.py
--- system-config-printer-1.4.5/system-config-printer.py.permission 2014-07-04 17:02:41.000000000 +0100
+++ system-config-printer-1.4.5/system-config-printer.py 2014-07-11 17:25:28.027096533 +0100
@@ -207,11 +207,13 @@ class GUI(GtkGUI):
Gtk.Window.set_default_icon_name ('printer')
edit_action = 'org.opensuse.cupspkhelper.mechanism.all-edit'
+ self.edit_permission = None
if Polkit:
- self.edit_permission = Polkit.Permission.new_sync (edit_action,
- None, None)
- else:
- self.edit_permission = None
+ try:
+ self.edit_permission = Polkit.Permission.new_sync (edit_action,
+ None, None)
+ except GLib.GError:
+ pass # Maybe cups-pk-helper isn't installed.
self.unlock_button = Gtk.LockButton ()
if self.edit_permission != None:

9
system-config-printer.spec
View File

@ -1,12 +1,13 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.4.5
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-permission.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@ -70,6 +71,9 @@ printers.
# Don't start the applet in GNOME.
%patch1 -p1 -b .no-applet-in-gnome
# Handle failure when cups-pk-helper not installed (bug #1118836).
%patch2 -p1 -b .permission
sed -i.cflags-override -e '/^CFLAGS/d' Makefile.{am,in}
%build
@ -170,6 +174,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
* Fri Jul 11 2014 Tim Waugh <twaugh@redhat.com> 1.4.5-2
- Handle failure when cups-pk-helper not installed (bug #1118836).
* Fri Jul 4 2014 Tim Waugh <twaugh@redhat.com> 1.4.5-1
- 1.4.5:
- Some codec fixes (bug #968142, bug #1023968, bug #1094037).