From a006500ba3f3d1ac247426f158c384dabc8a187d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 24 Oct 2016 18:22:50 +0200
Subject: [PATCH] fixing minor errors

---
 system-config-printer-minorerrors.patch | 43 +++++++++++++++++++++++++
 system-config-printer.spec              |  9 +++++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-minorerrors.patch

diff --git a/system-config-printer-minorerrors.patch b/system-config-printer-minorerrors.patch
new file mode 100644
index 0000000..8881c89
--- /dev/null
+++ b/system-config-printer-minorerrors.patch
@@ -0,0 +1,43 @@
+diff -up system-config-printer-1.5.7/jobviewer.py.minorerrors system-config-printer-1.5.7/jobviewer.py
+--- system-config-printer-1.5.7/jobviewer.py.minorerrors	2016-10-24 17:37:43.212104425 +0200
++++ system-config-printer-1.5.7/jobviewer.py	2016-10-24 17:52:58.886209601 +0200
+@@ -25,6 +25,8 @@ import dbus
+ import dbus.glib
+ import dbus.service
+ import threading
++import gi
++gi.require_version('Notify', '0.7')
+ from gi.repository import Notify
+ from gi.repository import GLib
+ from gi.repository import GObject
+@@ -52,6 +54,7 @@ from functools import reduce
+ cups.require("1.9.47")
+ 
+ try:
++    gi.require_version('GnomeKeyring', '1.0')
+     from gi.repository import GnomeKeyring
+     USE_KEYRING=True
+ except ImportError:
+diff -up system-config-printer-1.5.7/system-config-printer.py.minorerrors system-config-printer-1.5.7/system-config-printer.py
+--- system-config-printer-1.5.7/system-config-printer.py.minorerrors	2016-10-24 17:37:59.637936671 +0200
++++ system-config-printer-1.5.7/system-config-printer.py	2016-10-24 17:48:21.537238174 +0200
+@@ -27,14 +27,19 @@ import config
+ import sys, os, time, re
+ import _thread
+ import dbus
++import gi
+ try:
++    gi.require_version('Polkit', '1.0')
+     from gi.repository import Polkit
+ except:
+     Polkit = False
+ 
++gi.require_version('GdkPixbuf', '2.0')
+ from gi.repository import GdkPixbuf
+ try:
++    gi.require_version('Gdk', '3.0')
+     from gi.repository import Gdk
++    gi.require_version('Gtk', '3.0')
+     from gi.repository import Gtk
+     Gtk.init (sys.argv)
+ except RuntimeError as e:
diff --git a/system-config-printer.spec b/system-config-printer.spec
index acb6451..b8bc517 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,13 +7,14 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.5.7
-Release: 9%{?dist}
+Release: 10%{?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.5/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-shbang.patch
 Patch2: system-config-printer-device-sorting.patch
+Patch3: system-config-printer-minorerrors.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -90,6 +91,9 @@ printers.
 # Fixed device sorting (bug #1210733).
 %patch2 -p1 -b .device-sorting
 
+# Fixed minor errors (bug #1354606)
+%patch3 -p1 -b .minorerrors
+
 %build
 %configure --with-udev-rules
 make %{?_smp_mflags}
@@ -192,6 +196,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Mon Oct 24 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.7-10
+- fixing minor errors
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.7-9
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages