From bb03abe9308aef36b9d9d8fd38e9b8755488486c Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 18:18:34 +0100
Subject: [PATCH] update to 1.5.13 [release 1.5.13-1mamba;Sat Jan 02 2021]

---
 system-config-printer.spec | 43 ++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/system-config-printer.spec b/system-config-printer.spec
index 80bc8b4..966ac79 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,7 +1,7 @@
 %define majver %(echo %version | cut -d. -f1-2)
 
 Name:          system-config-printer
-Version:       1.5.12
+Version:       1.5.13
 Release:       1mamba
 Summary:       Helper functions and classes for using CUPS
 Group:         System/Libraries/Python
@@ -9,7 +9,7 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://cyberelk.net/tim/software/system-config-printer/
-Source:        https://github.com/OpenPrinting/system-config-printer.git/%{version}/system-config-printer-%{version}.tar.bz2
+Source:        https://github.com/OpenPrinting/system-config-printer.git/v%{version}/system-config-printer-%{version}.tar.bz2
 #Source:        https://github.com/zdohnal/system-config-printer/releases/download/%{version}/system-config-printer-%{version}.tar.xz
 Patch0:        system-config-printer-1.4.1-newprinter-smb_select_function-argsfix.patch
 Patch1:        system-config-printer-1.4.3-scp-dbus-service-fix-dbus-signature-typo.patch
@@ -25,21 +25,21 @@ BuildRequires: libusbx-devel
 BuildRequires: intltool
 BuildRequires: xmlto
 BuildRequires: desktop-file-utils
-BuildRequires: python-pynotify
+#BuildRequires: python-pynotify
 Requires:      python >= %python_version
 Provides:      python-cupshelper
-Obsoletes:     python-cupshelper
+Obsoletes:     python-cupshelper <= 1.5.12
 Provides:      python-cupshelpers
-Obsoletes:     python-cupshelpers
+Obsoletes:     python-cupshelpers <= 1.5.12
 Requires:      desktop-file-utils
-Requires:      python-pynotify
-Requires:      python-smbc
-Requires:      python-cups-py36
-Requires:      python-requests-py36
-Requires:      pygobject-py36
-Requires:      python-dbus-py36
-Requires:      pycairo-py36
-Requires:      python-reload-py36
+#Requires:      python-pynotify
+#Requires:      python-smbc
+Requires:      python-cups-py3
+Requires:      python-requests-py3
+Requires:      pygobject-py3
+Requires:      python-dbus-py3
+Requires:      pycairo-py3
+Requires:      python-reload-py3
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -54,13 +54,13 @@ The purpose of the tool is to configure a CUPS server (often the local machine)
 
 ./bootstrap 
 
-sed -i "s|!/usr/bin/python3|!%{__python36}|" \
-   *.py */*.py udev/udev-add-printer
+#sed -i "s|!/usr/bin/python3|!%{__python36}|" \
+#   *.py */*.py udev/udev-add-printer
 
 %build
 %configure \
    --with-udev-rules \
-   PYTHON=%{__python36}
+   PYTHON=%{__python3}
 
 %make
 
@@ -83,22 +83,25 @@ sed -i "s|!/usr/bin/python3|!%{__python36}|" \
 %{_bindir}/system-config-printer
 %{_bindir}/system-config-printer-applet
 %{_bindir}/scp-dbus-service
-/lib/systemd/system/configure-printer@.service
+%{_unitdir}/configure-printer@.service
 /lib/udev/udev-add-printer
 /lib/udev/udev-configure-printer
-/lib/udev/rules.d/70-printers.rules
+%{_udevrulesdir}/70-printers.rules
 %{_datadir}/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
 %{_datadir}/dbus-1/services/org.fedoraproject.Config.Printing.service
 %{_datadir}/metainfo/system-config-printer.appdata.xml
 %{_datadir}/applications/system-config-printer.desktop
 %dir %{_datadir}/system-config-printer
 %{_datadir}/system-config-printer/*
-%{python36_sitelib}/cupshelpers/*
-%{python36_sitelib}/cupshelpers-1.0-py*.egg-info
+%{python3_sitelib}/cupshelpers/*
+%{python3_sitelib}/cupshelpers-1.0-py*.egg-info
 %{_mandir}/man1/system-config-printer.1*
 %{_mandir}/man1/system-config-printer-applet.1*
 
 %changelog
+* Sat Jan 02 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.13-1mamba
+- update to 1.5.13
+
 * Sat Nov 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.12-1mamba
 - update to 1.5.12