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

workaround for #1400947

Browse Source
This commit is contained in:
Zdenek Dohnal 2017-06-19 20:03:19 +02:00
parent eaa9cfc484
commit 3b82e9a836
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system-config-printer-1.5.9-keyring-workaround.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up system-config-printer-1.5.9/jobviewer.py.keyring-workaround system-config-printer-1.5.9/jobviewer.py
--- system-config-printer-1.5.9/jobviewer.py.keyring-workaround 2017-06-19 16:40:42.072825363 +0200
+++ system-config-printer-1.5.9/jobviewer.py 2017-06-19 16:42:18.250024332 +0200
@@ -57,7 +57,7 @@ try:
gi.require_version('GnomeKeyring', '1.0')
from gi.repository import GnomeKeyring
USE_KEYRING=True
-except ImportError:
+except (ImportError, ValueError):
USE_KEYRING=False
import gettext

7
system-config-printer.spec
View File

@ -9,13 +9,14 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.5.9
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
URL: https://github.com/%{username}/%{name}
Group: System Environment/Base
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch01: system-config-printer-1.5.9-bz1419175.patch
Patch02: system-config-printer-1.5.9-keyring-workaround.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@ -86,6 +87,7 @@ printers.
%prep
%setup -q
%patch01 -p1 -b .bz1419175
%patch02 -p1 -b .keyring-workaround
%build
%configure --with-udev-rules
@ -190,6 +192,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0
%changelog
* Mon Jun 19 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.9-4
- workaround for #1400947
* Wed Mar 08 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.9-3
- 1419175 - [control-center] cannot add network printer