20 changed files with 521 additions and 695 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,266 +1 @@
-printconf-0.6.113.tar.bz2
-printconf-0.6.114.tar.bz2
-printconf-0.6.115.tar.bz2
-printconf-0.6.116.tar.bz2
-printconf-0.6.117.tar.bz2
-printconf-0.6.118.tar.bz2
-printconf-0.6.119.tar.bz2
-printconf-0.6.120.tar.bz2
-printconf-0.6.121.tar.bz2
-printconf-0.6.122.tar.bz2
-printconf-0.6.123.tar.bz2
-printconf-0.6.124.tar.bz2
-printconf-0.6.125.tar.bz2
-printconf-0.6.126.tar.bz2
-printconf-0.6.127.tar.bz2
-printconf-0.6.128.tar.bz2
-printconf-0.6.129.tar.bz2
-printconf-0.6.130.tar.bz2
-printconf-0.6.131.tar.bz2
-printconf-0.6.132.tar.bz2
-printconf-0.6.133.tar.bz2
-printconf-0.6.134.tar.bz2
-printconf-0.6.135.tar.bz2
-printconf-0.6.136.tar.bz2
-printconf-0.6.137.tar.bz2
-printconf-0.6.138.tar.bz2
-printconf-0.6.139.tar.bz2
-printconf-0.6.140.tar.bz2
-printconf-0.6.141.tar.bz2
-printconf-0.6.142.tar.bz2
-printconf-0.6.143.tar.bz2
-printconf-0.6.144.tar.bz2
-printconf-0.6.145.tar.bz2
-printconf-0.6.146.tar.bz2
-printconf-0.6.147.tar.bz2
-printconf-0.6.148.tar.bz2
-printconf-0.6.149.tar.bz2
-printconf-0.6.150.tar.bz2
-printconf-0.6.151.tar.bz2
-system-config-printer-0.7.4.tar.bz2
-pycups-1.9.7.tar.bz2
-pycups-1.9.8.tar.bz2
-system-config-printer-0.7.5.tar.bz2
-system-config-printer-0.7.6.tar.bz2
-pycups-1.9.9.tar.bz2
-system-config-printer-0.7.7.tar.bz2
-pycups-1.9.10.tar.bz2
-system-config-printer-0.7.8.tar.bz2
-pycups-1.9.11.tar.bz2
-system-config-printer-0.7.9.tar.bz2
-system-config-printer-0.7.10.tar.bz2
-system-config-printer-0.7.11.tar.bz2
-system-config-printer-0.7.12.tar.bz2
-system-config-printer-0.7.13.tar.bz2
-system-config-printer-0.7.14.tar.bz2
-system-config-printer-0.7.15.tar.bz2
-system-config-printer-0.7.16.tar.bz2
-system-config-printer-0.7.17.tar.bz2
-system-config-printer-0.7.18.tar.bz2
-system-config-printer-0.7.19.tar.bz2
-system-config-printer-0.7.20.tar.bz2
-pycups-1.9.12.tar.bz2
-system-config-printer-0.7.21.tar.bz2
-system-config-printer-0.7.22.tar.bz2
-system-config-printer-0.7.23.tar.bz2
-system-config-printer-0.7.24.tar.bz2
-system-config-printer-0.7.25.tar.bz2
-system-config-printer-0.7.26.tar.bz2
-system-config-printer-0.7.27.tar.bz2
-system-config-printer-0.7.28.tar.bz2
-system-config-printer-0.7.29.tar.bz2
-system-config-printer-0.7.30.tar.bz2
-system-config-printer-0.7.31.tar.bz2
-pycups-1.9.13.tar.bz2
-system-config-printer-0.7.32.tar.bz2
-pycups-1.9.14.tar.bz2
-system-config-printer-0.7.35.tar.bz2
-system-config-printer-0.7.36.tar.bz2
-system-config-printer-0.7.37.tar.bz2
-pycups-1.9.15.tar.bz2
-system-config-printer-0.7.38.tar.bz2
-system-config-printer-0.7.39.tar.bz2
-system-config-printer-0.7.40.tar.bz2
-pycups-1.9.16.tar.bz2
-system-config-printer-0.7.41.tar.bz2
-system-config-printer-0.7.42.tar.bz2
-system-config-printer-0.7.43.tar.bz2
-system-config-printer-0.7.44.tar.bz2
-system-config-printer-0.7.45.tar.bz2
-system-config-printer-0.7.46.tar.bz2
-system-config-printer-0.7.47.tar.bz2
-system-config-printer-0.7.49.tar.bz2
-system-config-printer-0.7.50.tar.bz2
-system-config-printer-0.7.51.tar.bz2
-system-config-printer-0.7.52.tar.bz2
-system-config-printer-0.7.53.tar.bz2
-system-config-printer-0.7.54.tar.bz2
-system-config-printer-0.7.55.tar.bz2
-system-config-printer-0.7.56.tar.bz2
-pycups-1.9.18.tar.bz2
-system-config-printer-0.7.57.tar.bz2
-system-config-printer-0.7.58.tar.bz2
-system-config-printer-0.7.59.tar.bz2
-pycups-1.9.19.tar.bz2
-system-config-printer-0.7.60.tar.bz2
-system-config-printer-0.7.61.tar.bz2
-system-config-printer-0.7.62.tar.bz2
-pycups-1.9.20.tar.bz2
-system-config-printer-0.7.63.tar.bz2
-system-config-printer-0.7.63.1.tar.bz2
-pycups-1.9.22.tar.bz2
-system-config-printer-0.7.65.tar.bz2
-system-config-printer-0.7.66.tar.bz2
-pycups-1.9.7.tar.bz2
-pycups-1.9.8.tar.bz2
-pycups-1.9.9.tar.bz2
-pycups-1.9.10.tar.bz2
-pycups-1.9.11.tar.bz2
-pycups-1.9.12.tar.bz2
-pycups-1.9.13.tar.bz2
-pycups-1.9.14.tar.bz2
-pycups-1.9.15.tar.bz2
-pycups-1.9.16.tar.bz2
-pycups-1.9.18.tar.bz2
-pycups-1.9.19.tar.bz2
-pycups-1.9.20.tar.bz2
-pycups-1.9.23.tar.bz2
-pycups-1.9.24.tar.bz2
-system-config-printer-0.7.67.tar.bz2
-system-config-printer-0.7.68.tar.bz2
-system-config-printer-0.7.69.tar.bz2
-system-config-printer-0.7.70.tar.bz2
-system-config-printer-0.7.71.tar.bz2
-system-config-printer-0.7.72.tar.bz2
-system-config-printer-0.7.73.tar.bz2
-pycups-1.9.25.tar.bz2
-system-config-printer-0.7.74.tar.bz2
-system-config-printer-0.7.74.1.tar.bz2
-pycups-1.9.26.tar.bz2
-pycups-1.9.27.tar.bz2
-system-config-printer-0.7.74.2.tar.bz2
-system-config-printer-0.7.74.3.tar.bz2
-system-config-printer-0.7.74.4.tar.bz2
-system-config-printer-0.7.75.tar.bz2
-system-config-printer-0.7.76.tar.bz2
-system-config-printer-0.7.77.tar.bz2
-pycups-1.9.29.tar.bz2
-pycups-1.9.30.tar.bz2
-pycups-1.9.31.tar.bz2
-system-config-printer-0.7.78.tar.bz2
-pycups-1.9.32.tar.bz2
-pycups-1.9.33.tar.bz2
-system-config-printer-0.7.79.tar.bz2
-pycups-1.9.34.tar.bz2
-system-config-printer-0.7.80.tar.bz2
-system-config-printer-0.7.81.tar.bz2
-pycups-1.9.35.tar.bz2
-system-config-printer-0.7.82.tar.bz2
-system-config-printer-0.7.82.1.tar.bz2
-pycups-1.9.36.tar.bz2
-pycups-1.9.37.tar.bz2
-system-config-printer-0.7.82.2.tar.bz2
-pycups-1.9.38.tar.bz2
-system-config-printer-0.9.90.tar.bz2
-pysmbc-1.0.0.tar.bz2
-system-config-printer-0.9.91.tar.bz2
-pysmbc-1.0.2.tar.bz2
-system-config-printer-0.9.92.tar.bz2
-system-config-printer-0.9.93.tar.bz2
-system-config-printer-1.0.0.tar.bz2
-pycups-1.9.39.tar.bz2
-pysmbc-1.0.3.tar.bz2
-system-config-printer-1.0.1.tar.bz2
-system-config-printer-1.0.2.tar.bz2
-pysmbc-1.0.4.tar.bz2
-pycups-1.9.40.tar.bz2
-system-config-printer-1.0.3.tar.bz2
-system-config-printer-1.0.4.tar.bz2
-pycups-1.9.41.tar.bz2
-system-config-printer-1.0.5.tar.bz2
-system-config-printer-1.0.6.tar.bz2
-pycups-1.9.42.tar.bz2
-pysmbc-1.0.5.tar.bz2
-system-config-printer-1.0.7.tar.bz2
-system-config-printer-1.0.8.tar.bz2
-pysmbc-1.0.6.tar.bz2
-system-config-printer-1.0.9.tar.bz2
-system-config-printer-1.0.10.tar.bz2
-system-config-printer-1.0.11.tar.bz2
-pycups-1.9.43.tar.bz2
-pycups-1.9.44.tar.bz2
-system-config-printer-1.0.12.tar.bz2
-system-config-printer-1.1.0.tar.bz2
-system-config-printer-1.1.1.tar.bz2
-pycups-1.9.45.tar.bz2
-system-config-printer-1.1.2.tar.bz2
-system-config-printer-1.1.3.tar.bz2
-system-config-printer-1.1.4.tar.bz2
-system-config-printer-1.1.5.tar.bz2
-system-config-printer-1.1.6.tar.bz2
-system-config-printer-1.1.7.tar.bz2
-pycups-1.9.46.tar.bz2
-system-config-printer-1.1.8.tar.bz2
-system-config-printer-1.1.10.tar.bz2
-system-config-printer-1.1.11.tar.xz
-system-config-printer-1.1.12.tar.xz
-system-config-printer-1.1.13.tar.xz
-system-config-printer-1.1.14.tar.xz
-system-config-printer-1.1.15.tar.xz
-pycups-1.9.47.tar.bz2
-system-config-printer-1.1.16.tar.xz
-pycups-1.9.48.tar.bz2
-system-config-printer-1.1.90.tar.xz
-system-config-printer-1.1.91.tar.xz
-system-config-printer-1.1.92.tar.xz
-system-config-printer-1.1.93.tar.xz
-system-config-printer-1.2.0.tar.xz
-pycups-1.9.49.tar.bz2
-system-config-printer-1.2.1.tar.xz
-system-config-printer-1.2.2.tar.xz
-pysmbc-1.0.7.tar.bz2
-pycups-1.9.50.tar.bz2
-system-config-printer-1.2.3.tar.xz
-pycups-1.9.51.tar.bz2
-/pysmbc-1.0.9.tar.bz2
-/system-config-printer-1.2.4.tar.xz
-/system-config-printer-1.2.5.tar.xz
-/system-config-printer-1.2.95.tar.xz
-/system-config-printer-1.2.96.tar.xz
-/system-config-printer-1.2.97.tar.xz
-/system-config-printer-1.3.0.tar.xz
-/system-config-printer-1.3.1.tar.xz
-/system-config-printer-1.3.2.tar.xz
-/system-config-printer-1.3.3.tar.xz
-/system-config-printer-1.3.4.tar.xz
-/system-config-printer-1.3.5.tar.xz
-/system-config-printer-1.3.6.tar.xz
-/system-config-printer-1.3.7.tar.xz
-/system-config-printer-1.3.8.tar.xz
-/system-config-printer-1.3.9.tar.xz
-/system-config-printer-1.3.10.tar.xz
-/system-config-printer-1.3.11.tar.xz
-/system-config-printer-1.3.12.tar.xz
-/system-config-printer-1.3.13.tar.xz
-/system-config-printer-1.4.0.tar.xz
-/system-config-printer-1.4.1.tar.xz
-/system-config-printer-1.4.2.tar.xz
-/system-config-printer-1.4.3.tar.xz
-/system-config-printer-1.4.4.tar.xz
-/system-config-printer-1.4.5.tar.xz
-/system-config-printer-1.4.6.tar.xz
-/system-config-printer-1.5.0.tar.xz
-/system-config-printer-1.5.1.tar.xz
-/system-config-printer-1.5.2.tar.xz
-/system-config-printer-1.5.3.tar.xz
-/system-config-printer-1.5.4.tar.xz
-/system-config-printer-1.5.5.tar.xz
-/system-config-printer-1.5.6.tar.xz
-/system-config-printer-1.5.7.tar.xz
-/system-config-printer-1.5.9.tar.gz
 /system-config-printer-1.5.11.tar.gz
-/system-config-printer-1.5.12.tar.gz
-/system-config-printer-1.5.13.tar.xz
-/system-config-printer-1.5.15.tar.xz
-/system-config-printer-1.5.16.tar.xz
-/system-config-printer-1.5.18.tar.xz
--- a/0001-Fallback-to-using-LC_CTYPE-if-LC_MESSAGES-is-empty-a.patch
+++ b/0001-Fallback-to-using-LC_CTYPE-if-LC_MESSAGES-is-empty-a.patch
@ -0,0 +1,41 @@
+From f52f192d241f49334aa46dca1fe9c22b2ee37ff3 Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <antonio.larrosa@gmail.com>
+Date: Thu, 31 May 2018 12:07:19 +0200
+Subject: [PATCH] Fallback to using LC_CTYPE if LC_MESSAGES is empty and fix
+ _language use
+
+On openSUSE, LC_MESSAGES is not set by default, so fallback to LC_CTYPE in
+that case.
+
+Also, self._language is not a list (unlike in other classes) but the language
+itself, so if we get the first element, we would be getting the first letter,
+not the language.
+---
+ scp-dbus-service.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scp-dbus-service.py b/scp-dbus-service.py
+index 1338836b..b3c03217 100644
+--- a/scp-dbus-service.py
+++ b/scp-dbus-service.py
+@@ -471,6 +471,8 @@ class ConfigPrinting(dbus.service.Object):
+         self._jobappletpath = None
+         self._ppds = None
+         self._language = locale.getlocale (locale.LC_MESSAGES)[0]
+        if not self._language:
+            self._language = locale.getlocale (locale.LC_CTYPE)[0]
+ 
+     def destroy (self):
+         self._cupsconn.destroy ()
+@@ -511,7 +513,7 @@ class ConfigPrinting(dbus.service.Object):
+     def GetBestDrivers(self, device_id, device_make_and_model, device_uri,
+                    reply_handler, error_handler):
+         GetBestDriversRequest (device_id, device_make_and_model, device_uri,
+-                               self._cupsconn, self._language[0],
+                               self._cupsconn, self._language,
+                                reply_handler, error_handler)
+ 
+     @dbus.service.method(dbus_interface=CONFIG_IFACE,
+-- 
+2.17.2
+
--- a/0001-Fix-TypeError-raised-by-debugprint-call.patch
+++ b/0001-Fix-TypeError-raised-by-debugprint-call.patch
@ -0,0 +1,29 @@
+From 4ab0958643827777f526b180ece874d40009986d Mon Sep 17 00:00:00 2001
+From: Tomas Korbar <tkorbar@redhat.com>
+Date: Thu, 27 Sep 2018 17:27:39 +0200
+Subject: [PATCH] Fix TypeError raised by debugprint call
+
+- this error is caused by typo in options.py:424 debugprint call
+- debugprint function takes only one parameter so i think it should
+have been formated string
+- fix https://bugzilla.redhat.com/show_bug.cgi?id=1619593
+---
+ options.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/options.py b/options.py
+index 4dc0b1fe..d756f98d 100644
+--- a/options.py
+++ b/options.py
+@@ -421,7 +421,7 @@ class OptionSelectOne(Option):
+             self.selector.set_active(selected)
+         else:
+             debugprint("Unknown value for %s: %s" % (name, value))
+-            debugprint("Choices:", supported)
+            debugprint("Choices: %s" % (supported))
+             if len(supported) > 0:
+                 debugprint("Selecting from choices:", supported[0])
+                 self.selector.set_active(0)
+-- 
+2.17.2
+
--- a/0001-Fix-debugprint-in-options.py-fixes-291.patch
+++ b/0001-Fix-debugprint-in-options.py-fixes-291.patch
@ -1,26 +0,0 @@
-From 399b3334d6519639cfe7f1c0457e2475b8ee5230 Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Thu, 13 Oct 2022 14:03:37 +0200
-Subject: [PATCH] Fix debugprint() in options.py (fixes #291)
-
---
- NEWS       | 4 ++++
- options.py | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/options.py b/options.py
-index d756f98d..d7c236de 100644
--- a/options.py
-+++ b/options.py
-@@ -423,7 +423,7 @@ class OptionSelectOne(Option):
-             debugprint("Unknown value for %s: %s" % (name, value))
-             debugprint("Choices: %s" % (supported))
-             if len(supported) > 0:
-                debugprint("Selecting from choices:", supported[0])
-+                debugprint("Selecting from choices: %s" % supported[0])
-                 self.selector.set_active(0)
-         self.selector.connect("changed", self.changed)
- 
-- 
-2.39.2
-
--- a/0001-Fix-typo-in-debugprint-call-https-github.com-zdohnal.patch
+++ b/0001-Fix-typo-in-debugprint-call-https-github.com-zdohnal.patch
@ -0,0 +1,26 @@
+From 027ed8683a0ec30dbe705fe4d8f31c8ccb973199 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 30 Aug 2018 12:05:53 +0200
+Subject: [PATCH] Fix typo in debugprint call
+ (https://github.com/zdohnal/system-config-printer/issues/105)
+
+---
+ newprinter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/newprinter.py b/newprinter.py
+index 850c986b..051fc253 100644
+--- a/newprinter.py
+++ b/newprinter.py
+@@ -1049,7 +1049,7 @@ class NewPrinterGUI(GtkGUI):
+             debugprint('No packages for driver')
+             return None
+         if len(arches) > 1:
+-            debugprint('Returned more than one matching architecture, please report this as a bug: %s', repr (arches))
+            debugprint('Returned more than one matching architecture, please report this as a bug: %s' % repr (arches))
+             return None
+ 
+         pkgs = pkgs[arches[0]]
+-- 
+2.17.2
+
--- a/0001-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch
+++ b/0001-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch
@ -0,0 +1,35 @@
+From 3fee7c63c3aba395a3d8cf0bf4ea0fd2fae695ae Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Mon, 26 Feb 2018 11:54:10 +0100
+Subject: [PATCH] Require proper version of GDK and GTK in scp-dbus-service as
+ well
+
+scp-dbus-service can be D-Bus activated, that means that
+gi.require_version() is not called before.
+
+That needs to be kept in sync with the required version in the main
+program file.
+---
+ scp-dbus-service.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scp-dbus-service.py b/scp-dbus-service.py
+index f0f51efc..3aefc6c6 100644
+--- a/scp-dbus-service.py
+++ b/scp-dbus-service.py
+@@ -21,9 +21,12 @@
+ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ import dbus.service
+import gi
+ from gi.repository import GObject
+ from gi.repository import GLib
+gi.require_version('Gdk', '3.0')
+ from gi.repository import Gdk
+gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ import sys
+ 
+-- 
+2.17.2
+
--- a/0001-Set-programe-name-for-scp-dbus-service-as-well.patch
+++ b/0001-Set-programe-name-for-scp-dbus-service-as-well.patch
@ -0,0 +1,41 @@
+From d818802daefd66eafbcc1618dc731e65de3e08b8 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Mon, 26 Feb 2018 13:59:26 +0100
+Subject: [PATCH] Set programe name for scp-dbus-service as well
+
+scp-dbus-service can be D-Bus activated, that means that the program
+name is never set meaning that the icon and the fancy name in the window
+list is never set.
+
+This completes the fix for bug #53
+---
+ scp-dbus-service.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/scp-dbus-service.py b/scp-dbus-service.py
+index 3aefc6c6..1338836b 100644
+--- a/scp-dbus-service.py
+++ b/scp-dbus-service.py
+@@ -20,8 +20,8 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+-import dbus.service
+ import gi
+import dbus.service
+ from gi.repository import GObject
+ from gi.repository import GLib
+ gi.require_version('Gdk', '3.0')
+@@ -55,6 +55,9 @@ CONFIG_JOBVIEWER_IFACE=CONFIG_IFACE + ".JobViewer"
+ g_ppds = None
+ g_killtimer = None
+ 
+#set program name
+GLib.set_prgname("system-config-printer")
+
+ class FetchedPPDs(GObject.GObject):
+     __gsignals__ = {
+         'ready': (GObject.SIGNAL_RUN_LAST, None, ()),
+-- 
+2.17.2
+
--- a/0001-Use-ValueError-instead-of-ImportError-to-catch-excep.patch
+++ b/0001-Use-ValueError-instead-of-ImportError-to-catch-excep.patch
@ -0,0 +1,32 @@
+From 96e1f5b242f4be5b20d408e6f526caaaecf34a48 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon@bigon.be>
+Date: Mon, 26 Feb 2018 11:17:22 +0100
+Subject: [PATCH] Use ValueError instead of ImportError to catch exception when
+ importing GIR bindings
+
+When importing specific version of GIR bindings, the ValueError
+exception is raised instead of ImportError.
+
+This should make libsecret optional as intended
+
+Fixes: #94
+---
+ jobviewer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jobviewer.py b/jobviewer.py
+index 6d9309ff..16b20300 100644
+--- a/jobviewer.py
+++ b/jobviewer.py
+@@ -57,7 +57,7 @@ try:
+     gi.require_version('Secret', '1')
+     from gi.repository import Secret
+     USE_SECRET=True
+-except ImportError:
+except ValueError:
+     USE_SECRET=False
+ 
+ import gettext
+-- 
+2.17.2
+
--- a/0001-define-classes-for-Secret-only-when-libsecret-is-ins.patch
+++ b/0001-define-classes-for-Secret-only-when-libsecret-is-ins.patch
@ -0,0 +1,148 @@
+From 42d95b7560c26f0fdf3b4f46823843861948c136 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Thu, 30 Aug 2018 11:52:48 +0200
+Subject: [PATCH] define classes for Secret only when libsecret is installed
+ (https://github.com/zdohnal/system-config-printer/issues/118,
+ https://github.com/zdohnal/system-config-printer/issues/115)
+
+---
+ jobviewer.py | 123 ++++++++++++++++++++++++++-------------------------
+ 1 file changed, 62 insertions(+), 61 deletions(-)
+
+diff --git a/jobviewer.py b/jobviewer.py
+index 16b20300..86f5feaf 100644
+--- a/jobviewer.py
+++ b/jobviewer.py
+@@ -73,67 +73,68 @@ SEARCHING_ICON="document-print-preview"
+ # We need to call Notify.init before we can check the server for caps
+ Notify.init('System Config Printer Notification')
+ 
+-NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE,
+-                                     {
+-                                         "user": Secret.SchemaAttributeType.STRING,
+-                                         "domain": Secret.SchemaAttributeType.STRING,
+-                                         "object": Secret.SchemaAttributeType.STRING,
+-                                         "protocol": Secret.SchemaAttributeType.STRING,
+-                                         "port": Secret.SchemaAttributeType.INTEGER,
+-                                         "server": Secret.SchemaAttributeType.STRING,
+-                                         "authtype": Secret.SchemaAttributeType.STRING,
+-                                         "uri": Secret.SchemaAttributeType.STRING,
+-                                     }
+-                                     )
+-
+-
+-class ServiceGet:
+-    service = Secret.Service()
+-
+-    def on_get_service(self, source, result, unused):
+-        service = Secret.Service.get_finish(result)
+-
+-    def __init__(self):
+-        Secret.Service.get(0,
+-                           None,
+-                           self.on_get_service,
+-                           None)
+-
+-    def get_service(self):
+-        return ServiceGet.service
+-
+-
+-class ItemSearch:
+-    items = list()
+-
+-    def on_search_item(self, source, result, unused):
+-        items = Secret.Service.search_finish(None, result)
+-
+-    def __init__(self, service, attrs):
+-        Secret.Service.search(service,
+-                              NETWORK_PASSWORD,
+-                              attrs,
+-                              Secret.SearchFlags.LOAD_SECRETS,
+-                              None,
+-                              self.on_search_item,
+-                              None)
+-
+-    def get_items(self):
+-        return ItemSearch.items
+-
+-
+-class PasswordStore:
+-    def __init__(self, attrs, name, secret):
+-        Secret.password_store(NETWORK_PASSWORD,
+-                              attrs,
+-                              Secret.COLLECTION_DEFAULT,
+-                              name,
+-                              secret,
+-                              None,
+-                              self.on_password_stored)
+-
+-    def on_password_stored(self, source, result, unused):
+-        Secret.password_store_finish(result)
+if USE_SECRET:
+    NETWORK_PASSWORD = Secret.Schema.new("org.system.config.printer.store", Secret.SchemaFlags.NONE,
+                                         {
+                                             "user": Secret.SchemaAttributeType.STRING,
+                                             "domain": Secret.SchemaAttributeType.STRING,
+                                             "object": Secret.SchemaAttributeType.STRING,
+                                             "protocol": Secret.SchemaAttributeType.STRING,
+                                             "port": Secret.SchemaAttributeType.INTEGER,
+                                             "server": Secret.SchemaAttributeType.STRING,
+                                             "authtype": Secret.SchemaAttributeType.STRING,
+                                             "uri": Secret.SchemaAttributeType.STRING,
+                                         }
+                                         )
+    
+    
+    class ServiceGet:
+        service = Secret.Service()
+    
+        def on_get_service(self, source, result, unused):
+            service = Secret.Service.get_finish(result)
+    
+        def __init__(self):
+            Secret.Service.get(0,
+                               None,
+                               self.on_get_service,
+                               None)
+    
+        def get_service(self):
+            return ServiceGet.service
+    
+    
+    class ItemSearch:
+        items = list()
+    
+        def on_search_item(self, source, result, unused):
+            items = Secret.Service.search_finish(None, result)
+    
+        def __init__(self, service, attrs):
+            Secret.Service.search(service,
+                                  NETWORK_PASSWORD,
+                                  attrs,
+                                  Secret.SearchFlags.LOAD_SECRETS,
+                                  None,
+                                  self.on_search_item,
+                                  None)
+    
+        def get_items(self):
+            return ItemSearch.items
+    
+    
+    class PasswordStore:
+        def __init__(self, attrs, name, secret):
+            Secret.password_store(NETWORK_PASSWORD,
+                                  attrs,
+                                  Secret.COLLECTION_DEFAULT,
+                                  name,
+                                  secret,
+                                  None,
+                                  self.on_password_stored)
+    
+        def on_password_stored(self, source, result, unused):
+            Secret.password_store_finish(result)
+ 
+ 
+ class PrinterURIIndex:
+-- 
+2.17.2
+
--- a/0001-encoding-Modified-to-use-utf-8-in-fdopen.patch
+++ b/0001-encoding-Modified-to-use-utf-8-in-fdopen.patch
@ -0,0 +1,66 @@
+From e7940de50a7164a2de82e003222ecbf8b10c9ad5 Mon Sep 17 00:00:00 2001
+From: xoduddk123 <xoduddk123@naver.com>
+Date: Wed, 20 Jun 2018 12:24:13 +0900
+Subject: [PATCH] encoding: Modified to use utf-8 in fdopen()
+
+The following error occurred due to encoding problem in fdopen().
+
+root@tykwon:~# cat /var/log/syslog
+2018-02-12T17:08:24.208317+09:00 tykwon kernel: usb 1-1.2: new high-speed USB device number 4 using dwc_otg
+2018-02-12T17:08:24.309341+09:00 tykwon kernel: usb 1-1.2: New USB device found, idVendor=03f0, idProduct=3b2a
+2018-02-12T17:08:24.309398+09:00 tykwon kernel: usb 1-1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+2018-02-12T17:08:24.309415+09:00 tykwon kernel: usb 1-1.2: Product: HP Color LaserJet MFP M277n
+2018-02-12T17:08:24.309428+09:00 tykwon kernel: usb 1-1.2: Manufacturer: Hewlett-Packard
+2018-02-12T17:08:24.318314+09:00 tykwon kernel: usb 1-1.2: SerialNumber: VNBKK97643
+2018-02-12T17:08:24.340967+09:00 tykwon root: loading HP Device 001 004
+2018-02-12T17:08:25.537224+09:00 tykwon python: io/hpmud/musb.c 2185: [307] hpmud_make_usb_uri() bus=001 dev=004
+2018-02-12T17:08:25.540188+09:00 tykwon python: io/hpmud/musb.c 2282: hpmud_make_usb_uri() uri=hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643 bytes_read=53
+2018-02-12T17:08:26.510021+09:00 tykwon kernel: usblp 1-1.2:1.1: usblp0: USB Bidirectional printer dev 4 if 1 alt 0 proto 2 vid 0x03F0 pid 0x3B2A
+2018-02-12T17:08:26.518337+09:00 tykwon kernel: usbcore: registered new interface driver usblp
+2018-02-12T17:08:26.523457+09:00 tykwon systemd[1]: Created slice system-configure\x2dprinter.slice.
+2018-02-12T17:08:26.525835+09:00 tykwon systemd[1]: Started Configure Plugged-In Printer.
+2018-02-12T17:08:26.527132+09:00 tykwon systemd[1]: Reached target Printer.
+2018-02-12T17:08:26.546282+09:00 tykwon udev-configure-printer: add usb-001-004
+2018-02-12T17:08:26.688365+09:00 tykwon udev-configure-printer: device devpath is /devices/lm1/usb1/1-1/1-1.2
+2018-02-12T17:08:26.700706+09:00 tykwon udev-configure-printer: MFG:Hewlett-Packard MDL:HP Color LaserJet MFP M277n SERN:- serial:VNBKK97643
+2018-02-12T17:08:31.788344+09:00 tykwon kernel: usblp0: removed
+2018-02-12T17:08:31.798343+09:00 tykwon kernel: usblp 1-1.2:1.1: usblp0: USB Bidirectional printer dev 4 if 1 alt 0 proto 2 vid 0x03F0 pid 0x3B2A
+2018-02-12T17:08:31.870363+09:00 tykwon udev-configure-printer: URI contains USB serial number
+2018-02-12T17:08:31.871482+09:00 tykwon udev-configure-printer: URI match: usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1
+2018-02-12T17:08:31.872536+09:00 tykwon udev-configure-printer: SERN field matches USB serial number
+2018-02-12T17:08:31.873629+09:00 tykwon udev-configure-printer: URI match: hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643
+2018-02-12T17:08:31.874594+09:00 tykwon udev-configure-printer: URI of detected printer: usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1, normalized: color laserjet mfp m277n serial vnbkk97643 interface 1
+2018-02-12T17:08:31.875782+09:00 tykwon udev-configure-printer: URI of print queue: hp:/usb/HP_LaserJet_Professional_P1106?serial=000000000QN926Y1PR1a, normalized: laserjet professional p1106 serial 000000000qn926y1pr1a
+2018-02-12T17:08:31.876985+09:00 tykwon udev-configure-printer: URI of detected printer: hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643, normalized: color laserjet mfp m277n serial vnbkk97643
+2018-02-12T17:08:31.878166+09:00 tykwon udev-configure-printer: About to add queue for hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643
+2018-02-12T17:08:34.760340+09:00 tykwon udev-add-printer: add_queue: URIs=['hp:/usb/HP_Color_LaserJet_MFP_M277n?serial=VNBKK97643', 'usb://HP/Color%20LaserJet%20MFP%20M277n?serial=VNBKK97643&interface=1']
+2018-02-12T17:08:34.766174+09:00 tykwon udev-add-printer: D-Bus method call failed: org.freedesktop.DBus.Error.ServiceUnknown: The name com.redhat.NewPrinterNotification was not provided by any .service files
+2018-02-12T17:08:41.722389+09:00 tykwon udev-add-printer: PPD: hplip:1/hp-color_laserjet_pro_mfp_m277-ps.ppd; Status: 0
+2018-02-12T17:08:45.763635+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 232, in <module>#012    add_queue (sys.argv[1], sys.argv[2:])
+2018-02-12T17:08:45.764840+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 169, in add_queue#012    installer)
+2018-02-12T17:08:45.765979+09:00 tykwon udev-add-printer: File "/lib/udev/udev-add-printer", line 75, in create_queue#012    (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd)
+2018-02-12T17:08:45.767236+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/site-packages/cupshelpers/cupshelpers.py", line 889, in missingPackagesAndExecutables#012    executables = missingExecutables(ppd)
+2018-02-12T17:08:45.768527+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/site-packages/cupshelpers/cupshelpers.py", line 864, in missingExecutables#012    for line in f:
+2018-02-12T17:08:45.769834+09:00 tykwon udev-add-printer: File "/usr/lib/python3.5/encodings/ascii.py", line 26, in decode#012    return codecs.ascii_decode(input, self.errors)[0]
+2018-02-12T17:08:45.771056+09:00 tykwon udev-add-printer: UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 4175: ordinal not in range(128)
+root@tykwon:~#
+---
+ cupshelpers/cupshelpers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 978ab801..8fe7ead4 100755
+--- a/cupshelpers/cupshelpers.py
+++ b/cupshelpers/cupshelpers.py
+@@ -859,7 +859,7 @@ def missingExecutables(ppd):
+         os.unlink (tmpfname)
+         ppd.writeFd (tmpfd)
+         os.lseek (tmpfd, 0, os.SEEK_SET)
+-        f = os.fdopen (tmpfd, "rt")
+        f = os.fdopen (tmpfd, "rt", encoding="utf-8")
+         search = "*cupsFilter:"
+         for line in f:
+             if line.startswith (search):
+-- 
+2.17.2
+
--- a/0001-require-Gtk-and-Gdk-version-3.0-in-asyncpk1.py.patch
+++ b/0001-require-Gtk-and-Gdk-version-3.0-in-asyncpk1.py.patch
@ -0,0 +1,26 @@
+From 8a623c2f038dd85da3df647531c6a881d235523c Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 23 Mar 2018 13:43:41 +0100
+Subject: [PATCH] require Gtk and Gdk version 3.0 in asyncpk1.py
+
+---
+ asyncpk1.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/asyncpk1.py b/asyncpk1.py
+index 65d2e768..849c995f 100644
+--- a/asyncpk1.py
+++ b/asyncpk1.py
+@@ -22,7 +22,9 @@ import cups
+ import dbus
+ from functools import reduce
+ try:
+    gi.require_version('Gdk', '3.0')
+     from gi.repository import Gdk
+    gi.require_version('Gtk', '3.0')
+     from gi.repository import Gtk
+ except:
+     pass
+-- 
+2.17.2
+
--- a/0001-udev-Fix-exit-value-when-device-is-already-handled.patch
+++ b/0001-udev-Fix-exit-value-when-device-is-already-handled.patch
@ -1,35 +0,0 @@
-From 77540d0cb539364bbf63e21cfa970e62d9a86ed3 Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 12 Mar 2024 18:59:43 +0100
-Subject: [PATCH] udev: Fix exit value when device is already handled
-
---
- NEWS                          | 1 +
- udev/udev-configure-printer.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
-index fd158b09..5703c1af 100644
--- a/udev/udev-configure-printer.c
-+++ b/udev/udev-configure-printer.c
-@@ -806,7 +806,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
-   {
-     udev_device_unref (dev);
-     syslog (LOG_ERR, "unable to access %s", syspath);
-    return NULL;
-+    exit (1);
-   }
- 
-   usb_device_devpath = strdup (udev_device_get_devpath (dev));
-@@ -831,7 +831,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
-     syslog (LOG_DEBUG, "Device already handled");
-     free (usb_device_devpath);
-     free (devicefilepath);
-    return NULL;
-+    exit (0);
-   }
- 
-   serial = udev_device_get_sysattr_value (dev, "serial");
-- 
-2.44.0
-
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,25 +1,7 @@
 --- !Policy
 product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#Rawhide
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#gating rhel
--- !Policy
-product_versions:
-  - rhel-*
+    - rhel-8
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+    - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
--- a/plans.fmf
+++ b/plans.fmf
@ -1,36 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/tier1/internal
-
-/tier1-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/tier1/public
-
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/tier2-tier3/internal
-
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/tier2-tier3/public
-
-/others-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/others/internal
-
-/others-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/system-config-printer.git
-      name: /plans/others/public
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (system-config-printer-1.5.18.tar.xz) = 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
+SHA512 (system-config-printer-1.5.11.tar.gz) = d7aed7eab7807ee16b1a8f82290923ba90b711d9e5b58be10568980301fc6bb55d4b18f3049b612fb9fffcde08273dbb1f2c34a34c50e6e66e9f8fab79fc81c2
--- a/system-config-printer-authdialog.patch
+++ b/system-config-printer-authdialog.patch
@ -0,0 +1,15 @@
+diff -up system-config-printer-1.5.11/authconn.py.authdialog system-config-printer-1.5.11/authconn.py
+--- system-config-printer-1.5.11/authconn.py.authdialog	2018-02-15 11:42:35.074157581 +0100
+++ system-config-printer-1.5.11/authconn.py	2018-02-15 11:43:51.652437359 +0100
+@@ -78,11 +78,9 @@ class AuthDialog(Gtk.Dialog):
+             field = auth_info_required[i]
+             label = Gtk.Label (label=_(self.AUTH_FIELD.get (field, field)))
+             label.set_alignment (0, 0.5)
+-            grid.attach (label, 0, 1, i, i + 1)
+             grid.attach (label, 0, i, 1, 1)
+             entry = Gtk.Entry ()
+             entry.set_visibility (field != 'password')
+-            grid.attach (entry, 1, 2, i, i + 1, 0, 0)
+             grid.attach (entry, 1, i, 1, 1)
+             self.field_entry.append (entry)
+ 
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@ -4,79 +4,56 @@
 # Enable hardened build, as the udev part runs with privilege.
 %global _hardened_build 1

-%global username OpenPrinting
+%global username zdohnal

 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.5.18
-Release: 11%{?dist}
-License: GPL-2.0-or-later
+Version: 1.5.11
+Release: 13%{?dist}
+License: GPLv2+
 URL: https://github.com/%{username}/%{name}
-Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz

 # all upstream patches, remove with new release
-Patch0001: 0001-Fix-debugprint-in-options.py-fixes-291.patch
-# RHEL-28165 - configure-printer exits with failure status when device is already handled
-Patch0002: 0001-udev-Fix-exit-value-when-device-is-already-handled.patch
+Patch01: system-config-printer-authdialog.patch
+Patch02: 0001-Use-ValueError-instead-of-ImportError-to-catch-excep.patch
+Patch03: 0001-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch
+Patch04: 0001-Set-programe-name-for-scp-dbus-service-as-well.patch
+Patch05: 0001-require-Gtk-and-Gdk-version-3.0-in-asyncpk1.py.patch
+Patch06: 0001-encoding-Modified-to-use-utf-8-in-fdopen.patch
+Patch07: 0001-Fallback-to-using-LC_CTYPE-if-LC_MESSAGES-is-empty-a.patch
+Patch08: 0001-define-classes-for-Secret-only-when-libsecret-is-ins.patch
+Patch09: 0001-Fix-typo-in-debugprint-call-https-github.com-zdohnal.patch
+Patch10: 0001-Fix-TypeError-raised-by-debugprint-call.patch

-
-# needed for macro AM_GNU_GETTEXT in configure.ac
-BuildRequires: autoconf-archive
-# uses CUPS API functions
-BuildRequires: cups-devel >= 1.2
-# we install a desktop file
-BuildRequires: desktop-file-utils >= 0.2.92
 # gcc is no longer in buildroot by default
 # gcc is needed for udev-configure-printer.c
 BuildRequires: gcc
-# for translations
+
+BuildRequires: cups-devel >= 1.2
+BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
-# for autosetup
-BuildRequires: git-core
-# for translations
 BuildRequires: intltool
-# automatic printer setup tool, which uses udev, is only for USB printers
-# we need libusb API to communicate
 BuildRequires: libusb1-devel
-# uses make
-BuildRequires: make
-# GNOME library for GUI
 BuildRequires: pkgconfig(glib-2.0)
-# for python3 API
-BuildRequires: python3-devel
-# uses distutils
-BuildRequires: python3-setuptools
-# for automatic USB printer setup tool - udev-configure-printer
+BuildRequires: xmlto
 BuildRequires: systemd
 BuildRequires: systemd-devel
-# for generating manual
-BuildRequires: xmlto
+BuildRequires: python3-devel

-
-# for dBUS support in scp-dbus-service
-Requires: dbus-x11
-# for desktop file
-Requires: desktop-file-utils >= 0.2.92
-# for system notifications
-Requires: desktop-notification-daemon
-# for GUI, the app is written in gtk3
-Requires: gtk3%{?_isa}
-# for GUI to prevent warning during the startup
-Requires: libcanberra-gtk3
-# for notifications
-Requires: libnotify%{?_isa}
-# for GUI
-Requires: python3-cairo%{?_isa}
-# for dBUS python API
-Requires: python3-dbus%{?_isa}
-# the app can adjust firewalld, so we need firewall API in Python
-Requires: python3-firewall
-# for GUI
 Requires: python3-gobject%{?_isa}
-# runtime systemd requires for udev-configure-printer service
-%{?systemd_requires}
-# we use classes define in our library
+Requires: gtk3%{?_isa}
+Requires: desktop-file-utils >= 0.2.92
+Requires: dbus-x11
+Requires: python3-dbus%{?_isa}
 Requires: system-config-printer-libs = %{version}-%{release}
+Requires: desktop-notification-daemon
+Requires: libnotify%{?_isa}
+Requires: python3-cairo%{?_isa}
+Requires: python3-firewall
+Requires: libcanberra-gtk3
+Requires: PackageKit-gtk3-module
+%{?systemd_requires}

 %description
 system-config-printer is a graphical user interface that allows
@ -84,106 +61,69 @@ the user to configure a CUPS print server.

 %package libs
 Summary: Libraries and shared code for printer administration tool
-# PackageKit can bring you a popup window if some package in the repo provides a driver
-# for your printer
-Recommends: PackageKit
-Recommends: PackageKit-glib
-
-# for GUI
-Requires: gobject-introspection
-# written in GTK3
-Requires: gtk3
-# for notifications
-Requires: libnotify
-# s-c-p classes uses Python CUPS API
 Requires: python3-cups >= 1.9.60
-# the libs subpackage contains scp-dbus-service, so we need dBUS API in Python here
-Requires: python3-dbus
-# for GUI
+Requires: python3-pycurl
+Requires: gobject-introspection
 Requires: python3-gobject
-
-# s-c-p has a plug-in support for Samba, if the relevant package is installed
+Requires: gtk3
+Requires: python3-dbus
+Requires: python3-requests
 Suggests: python3-smbc
 BuildArch: noarch
+Obsoletes: %{name}-libs < 1.3.12-10

 %description libs
 The common code used by both the graphical and non-graphical parts of
 the configuration tool.

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %package applet
 Summary: Print job notification applet
 Requires: %{name}-libs

 %description applet
 Print job notification applet.
-%endif

 %package udev
 Summary: Rules for udev for automatic configuration of USB printers
 Requires: system-config-printer-libs = %{version}-%{release}
+Obsoletes: hal-cups-utils < 0.6.20
+Provides: hal-cups-utils = 0.6.20

 %description udev
 The udev rules and helper programs for automatically configuring USB
 printers.

 %prep
-%autosetup -S git
-# workaround https://github.com/pypa/setuptools/issues/3143
-sed -i 's/setup.py install --prefix=$(DESTDIR)$(prefix)/setup.py install --root $(DESTDIR) --prefix=$(prefix)/' Makefile*
+%setup -q
+%patch01 -p1 -b .authdialog
+%patch02 -p1 -b .upstream0
+%patch03 -p1 -b .upstream1
+%patch04 -p1 -b .upstream2
+%patch05 -p1 -b .upstream3
+%patch06 -p1 -b .upstream4
+%patch07 -p1 -b .upstream5
+%patch08 -p1 -b .upstream6
+%patch09 -p1 -b .upstream7
+%patch10 -p1 -b .upstream8

 %build
 %configure --with-udev-rules
-%make_build
+make %{?_smp_mflags}

 %install
-%make_install
+make DESTDIR=%buildroot install

 %{__mkdir_p} %buildroot%{_localstatedir}/run/udev-configure-printer
 touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris

 # Manually invoke the python byte compile macro for each path that
 # needs byte compilation
-%py_byte_compile %{__python3} %{buildroot}/%{_datadir}/system-config-printer
+%py_byte_compile %{__python3} %%{buildroot}%{python3_sitelib}/cupshelpers
+%py_byte_compile %{__python3} %%{buildroot}%{datadir}/system-config-printer

 %find_lang system-config-printer

-%if 0%{?rhel} > 8
-rm -rf %{buildroot}%{_bindir}/%{name}-applet \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/applet* \
-       %{buildroot}%{_datadir}/%{name}/applet.py* \
-       %{buildroot}%{_sysconfdir}/xdg/autostart/print-applet.desktop \
-       %{buildroot}%{_mandir}/man1/%{name}-applet.1* \
-       %{buildroot}%{_bindir}/%{name} \
-       %{buildroot}%{_bindir}/install-printerdriver \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/check-device-ids* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/HIG* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/SearchCriterion* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/serversettings* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/system-config-printer* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/ToolbarSearchEntry* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/userdefault* \
-       %{buildroot}%{_datadir}/%{name}/__pycache__/install-printerdriver* \
-       %{buildroot}%{_datadir}/%{name}/check-device-ids.py* \
-       %{buildroot}%{_datadir}/%{name}/HIG.py* \
-       %{buildroot}%{_datadir}/%{name}/SearchCriterion.py* \
-       %{buildroot}%{_datadir}/%{name}/serversettings.py* \
-       %{buildroot}%{_datadir}/%{name}/system-config-printer.py* \
-       %{buildroot}%{_datadir}/%{name}/ToolbarSearchEntry.py* \
-       %{buildroot}%{_datadir}/%{name}/userdefault.py* \
-       %{buildroot}%{_datadir}/%{name}/troubleshoot \
-       %{buildroot}%{_datadir}/%{name}/icons \
-       %{buildroot}%{_datadir}/%{name}/install-printerdriver.py* \
-       %{buildroot}%{_datadir}/%{name}/xml/__pycache__ \
-       %{buildroot}%{_datadir}/%{name}/xml/validate.py* \
-       %{buildroot}%{_datadir}/%{name}/ui \
-       %{buildroot}%{_datadir}/applications/system-config-printer.desktop \
-       %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml \
-       %{buildroot}%{_mandir}/man1/%{name}.1* \
-%endif
-
 %files libs -f system-config-printer.lang
-%doc ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD
 %license COPYING
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
@ -191,16 +131,6 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %{_datadir}/dbus-1/services/*.service
 %{_bindir}/scp-dbus-service
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/__pycache__/*
-%exclude %{_datadir}/%{name}/__pycache__/check-device-ids*
-%exclude %{_datadir}/%{name}/__pycache__/HIG*
-%exclude %{_datadir}/%{name}/__pycache__/SearchCriterion*
-%exclude %{_datadir}/%{name}/__pycache__/serversettings*
-%exclude %{_datadir}/%{name}/__pycache__/system-config-printer*
-%exclude %{_datadir}/%{name}/__pycache__/ToolbarSearchEntry*
-%exclude %{_datadir}/%{name}/__pycache__/userdefault*
-%exclude %{_datadir}/%{name}/__pycache__/install-printerdriver*
-%exclude %{_datadir}/%{name}/__pycache__/applet*
 %{_datadir}/%{name}/asyncconn.py*
 %{_datadir}/%{name}/asyncipp.py*
 %{_datadir}/%{name}/asyncpk1.py*
@ -232,22 +162,16 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
 %{_datadir}/%{name}/timedops.py*
-%dir %{_datadir}/%{name}/__pycache__
-%dir %{_datadir}/%{name}/xml
-%{_datadir}/%{name}/xml/*.rng
 %dir %{_sysconfdir}/cupshelpers
 %config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
 %{python3_sitelib}/cupshelpers
-%{python3_sitelib}/*.egg-info/
+%{python3_sitelib}/*.egg-info

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %files applet
 %{_bindir}/%{name}-applet
-%{_datadir}/%{name}/__pycache__/applet*
 %{_datadir}/%{name}/applet.py*
 %{_sysconfdir}/xdg/autostart/print-applet.desktop
 %{_mandir}/man1/%{name}-applet.1*
-%endif

 %files udev
 %{_prefix}/lib/udev/rules.d/*.rules
@ -256,20 +180,11 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_unitdir}/configure-printer@.service

-%if 0%{?rhel} <= 8 || 0%{?fedora}
 %files
 %doc ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD
 %license COPYING
 %{_bindir}/%{name}
 %{_bindir}/install-printerdriver
-%{_datadir}/%{name}/__pycache__/check-device-ids*
-%{_datadir}/%{name}/__pycache__/HIG*
-%{_datadir}/%{name}/__pycache__/SearchCriterion*
-%{_datadir}/%{name}/__pycache__/serversettings*
-%{_datadir}/%{name}/__pycache__/system-config-printer*
-%{_datadir}/%{name}/__pycache__/ToolbarSearchEntry*
-%{_datadir}/%{name}/__pycache__/userdefault*
-%{_datadir}/%{name}/__pycache__/install-printerdriver*
 %{_datadir}/%{name}/check-device-ids.py*
 %{_datadir}/%{name}/HIG.py*
 %{_datadir}/%{name}/SearchCriterion.py*
@ -280,8 +195,8 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/install-printerdriver.py*
-%dir %{_datadir}/%{name}/xml/__pycache__
-%{_datadir}/%{name}/xml/__pycache__/*
+%dir %{_datadir}/%{name}/xml
+%{_datadir}/%{name}/xml/*.rng
 %{_datadir}/%{name}/xml/validate.py*
 %dir %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/ui/*.ui
@ -290,135 +205,10 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %{_mandir}/man1/%{name}.1*

 %post
-%{_bindir}/rm -f /var/cache/foomatic/foomatic.pickle
+/bin/rm -f /var/cache/foomatic/foomatic.pickle
 exit 0
-%endif

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.18-11
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.18-10
- Bump release for June 2024 mass rebuild
-
-* Fri May 17 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-9
- adjust gating.yaml and build it to pass gating...
-
-* Wed Mar 20 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-8
- RHEL-28165 - configure-printer exits with failure status when device is already handled
- RHEL-26328 - Drop the dependency on python3-pycurl
-
-* Tue Jan 23 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-7
- 2259526 - FTBFS s-c-p due missing distutils
-
-* Thu Nov 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-6
- SPDX migration
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.5.18-4
- Rebuilt for Python 3.12
-
-* Tue Mar 14 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-3
- 2178027 - fix crash in options.py
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Sep 06 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-1
- 1.5.18
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.16-2
- Rebuilt for Python 3.11
-
-* Mon May 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.16-1
- 1.5.16
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Sep 06 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.15-5
- fix issues reported by Coverity scan
- add a weak dependency on PackageKit for scp-libs
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.5.15-3
- Rebuilt for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.15-1
- 1.5.15, apply eln changes
-
-* Tue Jan 05 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.13-3
- 1750156 - hangs on selection of change PPD (Make and Model)
-
-* Fri Nov 27 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.13-2
- set preferred driver for Dymo LabelWriter 400
-
-* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.13-1
- 1.15.13
-
-* Mon Oct 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-9
- 1884866 - s-c-p: isAlive() is removed, use is_alive()
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.12-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-7
- python3.9 - xml module removed elem.getchildren() method, use list(elem)
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.5.12-6
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.12-5
- Rebuilt for Python 3.9
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 31 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-3
- whole fix for #1765915
-
-* Tue Oct 29 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-2
- 1765915 - abrt in udev-configure-printer
-
-* Tue Oct 01 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.12-1
- 1.5.12
-
-* Tue Aug 27 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-21
- require libnotify - there can be cases where it is not brought by any other packages
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.11-20
- Rebuilt for Python 3.8
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 15 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-18
- 1729453 - system-config-printer does not ship byte-compiled Python files
-
-* Wed May 29 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-17
- upstream was moved to OpenPrinting
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.11-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 02 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-15
- remove packagekit-gtk3-module dependency
-
-* Fri Nov 09 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-14
- deprecate at_console statement
-
 * Mon Oct 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-13
 - backport several upstream patches

--- a/upstream-key.gpg
+++ b/upstream-key.gpg
@ -1,41 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-yN+XBvYpzg==
-=uNLi
-----END PGP PUBLIC KEY BLOCK-----