From 010234407bb0afc76f58fd8883e7945890d925f2d5a548455223ef5c00d2cff3 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Fri, 29 Sep 2023 18:44:27 +0000
Subject: [PATCH] Accepting request 1114437 from
 home:bnavigator:branches:Application:ERP:GNUHealth:Factory

- Fix single singlespec: Can't use python_subpackages rewriter

OBS-URL: https://build.opensuse.org/request/show/1114437
OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=35
---
 mygnuhealth.changes |  5 +++++
 mygnuhealth.spec    | 23 ++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/mygnuhealth.changes b/mygnuhealth.changes
index bf74a9c..45d0927 100644
--- a/mygnuhealth.changes
+++ b/mygnuhealth.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 29 18:39:29 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Fix single singlespec: Can't use python_subpackages rewriter
+
 -------------------------------------------------------------------
 Fri Sep 29 18:03:46 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/mygnuhealth.spec b/mygnuhealth.spec
index 8cde7ea..6c96ad9 100644
--- a/mygnuhealth.spec
+++ b/mygnuhealth.spec
@@ -26,9 +26,14 @@
 %if %{?suse_version} > 1500
 # only the primary one for TW
 %define pythons python3
+%define mypython python3
+%define mypython_sitelib %{python3_sitelib}
 %else
 # needs Python 3.9+
 %{?sle15_python_module_pythons}
+# use the one define in sle15_python_module_pythons
+%define mypython %pythons
+%define mypython_sitelib %{expand:%%%{mypython}_sitelib}
 %endif
 
 Name:           mygnuhealth
@@ -58,16 +63,16 @@ BuildRequires:  %{python_module pygal}
 BuildRequires:  %{python_module tinydb}
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module CairoSVG}
-Requires:       python-bcrypt
-Requires:       python-Kivy
-Requires:       python-pygal
-Requires:       python-tinydb
-Requires:       python-requests
-Requires:       python-CairoSVG
+Requires:       %{mypython}-bcrypt
+Requires:       %{mypython}-Kivy
+Requires:       %{mypython}-pygal
+Requires:       %{mypython}-tinydb
+Requires:       %{mypython}-requests
+Requires:       %{mypython}-CairoSVG
 # /SECTION
 BuildArch:      noarch
 # singlespec rewriter for exactly one python (see above)
-%python_subpackages
+
 
 %description
 The Personal Health Information Management System for Desktop and Mobile Devices
@@ -116,8 +121,8 @@ rm -rf /home/*/.cache/mygnuhealth
 %attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop
 %license COPYRIGHT LICENSE
-%{python_sitelib}/mygnuhealth
-%{python_sitelib}/mygnuhealth-%{version}.dist-info
+%{mypython_sitelib}/mygnuhealth
+%{mypython_sitelib}/mygnuhealth-%{version}.dist-info
 
 
 %files -n %{name}-doc