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