5 changed files with 182 additions and 30 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/system-config-printer-1.5.15.tar.xz
+SOURCES/system-config-printer-1.5.18.tar.xz
--- a/.system-config-printer.metadata
+++ b/.system-config-printer.metadata
@ -1 +1 @@
-766ffe01642cbc959ea34ee01cbe4e7116a514ed SOURCES/system-config-printer-1.5.15.tar.xz
+ac248b688ab103da7f034bd0d913e4e299206f4b SOURCES/system-config-printer-1.5.18.tar.xz
--- a/SOURCES/0001-Fix-debugprint-in-options.py-fixes-291.patch
+++ b/SOURCES/0001-Fix-debugprint-in-options.py-fixes-291.patch
@ -0,0 +1,26 @@
+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/SOURCES/0001-udev-Fix-exit-value-when-device-is-already-handled.patch
+++ b/SOURCES/0001-udev-Fix-exit-value-when-device-is-already-handled.patch
@ -0,0 +1,35 @@
+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/SPECS/system-config-printer.spec
+++ b/SPECS/system-config-printer.spec
@ -8,46 +8,75 @@

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

 # 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


+# 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: gettext-devel
 # for autosetup
 BuildRequires: git-core
-# uses make
-BuildRequires: make
-
-BuildRequires: cups-devel >= 1.2
-BuildRequires: desktop-file-utils >= 0.2.92
-BuildRequires: gettext-devel
+# 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)
-BuildRequires: xmlto
+# for python3 API
+BuildRequires: python3-devel
+# uses distutils
+BuildRequires: python3-setuptools
+# for automatic USB printer setup tool - udev-configure-printer
 BuildRequires: systemd
 BuildRequires: systemd-devel
-BuildRequires: python3-devel
+# for generating manual
+BuildRequires: xmlto

-Requires: python3-gobject%{?_isa}
-Requires: gtk3%{?_isa}
-Requires: desktop-file-utils >= 0.2.92
+
+# for dBUS support in scp-dbus-service
 Requires: dbus-x11
-Requires: python3-dbus%{?_isa}
-Requires: system-config-printer-libs = %{version}-%{release}
+# 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
-Requires: libcanberra-gtk3
+# for GUI
+Requires: python3-gobject%{?_isa}
+# runtime systemd requires for udev-configure-printer service
 %{?systemd_requires}
+# we use classes define in our library
+Requires: system-config-printer-libs = %{version}-%{release}

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

 %package libs
 Summary: Libraries and shared code for printer administration tool
-Requires: libnotify
-Requires: python3-cups >= 1.9.60
-Requires: python3-pycurl
+# 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
-Requires: python3-gobject
+# 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
-Requires: python3-requests
+# for GUI
+Requires: python3-gobject
+
+# s-c-p has a plug-in support for Samba, if the relevant package is installed
 Suggests: python3-smbc
 BuildArch: noarch

@ -89,6 +129,8 @@ 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*

 %build
 %configure --with-udev-rules
@ -196,7 +238,7 @@ rm -rf %{buildroot}%{_bindir}/%{name}-applet \
 %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
@ -253,12 +295,61 @@ exit 0
 %endif

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.15-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.5.18-10
+- Rebuilt for MSVSphere 10
+
+* 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 Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.15-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* 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