From bcd4fb7c6d4003a2aeb4f49e0d556ea1a0ea04f6 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] fix installation path of cupshelpers module [release
 1.5.16-2mamba;Tue May 17 2022]

---
 system-config-printer.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/system-config-printer.spec b/system-config-printer.spec
index d5477eb..73ed65f 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -2,7 +2,7 @@
 
 Name:          system-config-printer
 Version:       1.5.16
-Release:       1mamba
+Release:       2mamba
 Summary:       Helper functions and classes for using CUPS
 Group:         System/Libraries/Python
 Vendor:        openmamba
@@ -27,7 +27,6 @@ BuildRequires: intltool
 BuildRequires: xmlto
 BuildRequires: desktop-file-utils
 #BuildRequires: python-pynotify
-Requires:      python >= %python_version
 Provides:      python-cupshelper
 Obsoletes:     python-cupshelper <= 1.5.12
 Provides:      python-cupshelpers
@@ -59,6 +58,9 @@ The purpose of the tool is to configure a CUPS server (often the local machine)
 
 %build
 %configure \
+   --with-udev-rules \
+   --with-systemdsystemunitdir=%{_unitdir} \
+   --with-udevdir=%{_prefix}/lib/udev \
    --with-udev-rules \
    PYTHON=%{__python3}
 
@@ -66,8 +68,10 @@ The purpose of the tool is to configure a CUPS server (often the local machine)
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall udevhelperdir=/lib/udev/
+%makeinstall
 
+mv %{buildroot}%{python3_sitelib}/cupshelpers-1.0-py3.7.egg/cupshelpers \
+   %{buildroot}%{python3_sitelib}/
 %find_lang system-config-printer
 
 %clean
@@ -93,12 +97,17 @@ The purpose of the tool is to configure a CUPS server (often the local machine)
 %{_datadir}/applications/system-config-printer.desktop
 %dir %{_datadir}/system-config-printer
 %{_datadir}/system-config-printer/*
-%dir %{python3_sitelib}/cupshelpers-*-py*.egg
-%{python3_sitelib}/cupshelpers-*-py*.egg/*
+%dir %{python3_sitelib}/cupshelpers-1.0-py*.egg
+%{python3_sitelib}/cupshelpers-1.0-py*.egg/*
+%dir %{python3_sitelib}/cupshelpers
+%{python3_sitelib}/cupshelpers/*
 %{_mandir}/man1/system-config-printer.1*
 %{_mandir}/man1/system-config-printer-applet.1*
 
 %changelog
+* Tue May 17 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.16-2mamba
+- fix installation path of cupshelpers module
+
 * Mon Feb 21 2022 Automatic Build System <autodist@mambasoft.it> 1.5.16-1mamba
 - automatic version update by autodist