1.5.15, apply eln changes

.gitignore

@@ -261,3 +261,4 @@ pycups-1.9.51.tar.bz2
 /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

0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch

@@ -1,27 +0,0 @@
-From aa6500531326c4895f70f238a75f4537fe3532db Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 5 Jan 2021 13:22:52 +0100
-Subject: [PATCH] asyncpk1.py: Dont require the exact Gdk version #179
-
-It works around the freeze during changing printer driver, but it will generate a warning.
-The proper fix is to refactor threading code in s-c-p to follow GTK 3 standards.
----
- NEWS        | 1 +
- asyncpk1.py | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/asyncpk1.py b/asyncpk1.py
-index 849c995f..156b5f49 100644
---- a/asyncpk1.py
-+++ b/asyncpk1.py
-@@ -22,7 +22,6 @@ 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
--- 
-2.26.2
-

scp-dymo400.patch

@@ -1,33 +0,0 @@
-diff --git a/xml/preferreddrivers.xml b/xml/preferreddrivers.xml
-index 68269bf..004f61e 100644
---- a/xml/preferreddrivers.xml
-+++ b/xml/preferreddrivers.xml
-@@ -163,6 +163,10 @@
-       <ppdname match=".*splix"/>
-     </drivertype>
- 
-+    <drivertype name="dlw400">
-+      <ppdname match="drv:///sample.drv/dymo.ppd" />
-+    </drivertype>
-+
-     <drivertype name="turboprint">
-       <ppdname match=".*turboprint"/>
-     </drivertype>
-@@ -293,6 +297,17 @@
-       </avoid>
-     </printer>
- 
-+    <printer>
-+      <make-and-model match="DYMO LabelWriter 400" />
-+      <deviceid>
-+        <field name="MFG" match="DYMO" />
-+        <field name="MDL" match="LabelWriter 400" />
-+      </deviceid>
-+      <drivers>
-+        <drivertype>dlw400</drivertype>
-+      </drivers>
-+    </printer>
-+
-     <printer>
-       <!-- For all printers -->
-       <drivers>

sources

@@ -1 +1 @@
-SHA512 (system-config-printer-1.5.13.tar.xz) = f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
+SHA512 (system-config-printer-1.5.15.tar.xz) = b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e

system-config-printer.spec

@@ -8,15 +8,13 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.5.13
+Version: 1.5.15
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://github.com/%{username}/%{name}
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 # all upstream patches, remove with new release
-Patch1: scp-dymo400.patch
-Patch2: 0001-asyncpk1.py-Dont-require-the-exact-Gdk-version-179.patch
 
 
 # gcc is no longer in buildroot by default
@@ -67,24 +65,23 @@ 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
@@ -109,7 +106,42 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 
 %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
@@ -117,7 +149,6 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/dbus-1/services/*.service
 %{_bindir}/scp-dbus-service
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/__pycache__
 %{_datadir}/%{name}/__pycache__/*
 %exclude %{_datadir}/%{name}/__pycache__/check-device-ids*
 %exclude %{_datadir}/%{name}/__pycache__/HIG*
@@ -159,17 +190,22 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_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
 
+%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
@@ -178,6 +214,7 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %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
@@ -201,10 +238,8 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/install-printerdriver.py*
-%dir %{_datadir}/%{name}/xml
 %dir %{_datadir}/%{name}/xml/__pycache__
 %{_datadir}/%{name}/xml/__pycache__/*
-%{_datadir}/%{name}/xml/*.rng
 %{_datadir}/%{name}/xml/validate.py*
 %dir %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/ui/*.ui
@@ -215,8 +250,12 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %post
 %{_bindir}/rm -f /var/cache/foomatic/foomatic.pickle
 exit 0
+%endif
 
 %changelog
+* 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)