From 7485b5ca2961e7264a13e8f1cacfa16de90adfadcdc468461e91d58d596641aa Mon Sep 17 00:00:00 2001
From: Simon Lees <simonf.lees@suse.com>
Date: Thu, 11 Jan 2024 11:35:31 +0000
Subject: [PATCH] Accepting request 1138115 from
 home:simotek:branches:devel:tools:building

Merge in changes from https://build.opensuse.org/request/show/1137930/

- Use new enough Sphinx on SLE (jsc#PED-7572 boo#1218125).

OBS-URL: https://build.opensuse.org/request/show/1138115
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=564
---
 cmake.changes | 7 ++++++-
 cmake.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/cmake.changes b/cmake.changes
index 02da707..7a43dc0 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 10:21:03 UTC 2024 - Michal Suchanek <msuchanek@suse.com>
+
+- Use new enough Sphinx on SLE (jsc#PED-7572 boo#1218125).
+
 -------------------------------------------------------------------
 Thu Jan 11 01:28:45 UTC 2024 - Simon Lees <sflees@suse.de>
 
@@ -339,7 +344,7 @@ Tue Aug  2 09:04:01 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
 Sat Jul  2 07:32:54 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 
 - Fix the %%cmake macro which tried to run sed on 'CMakeLists.txt'
-  without making sure it's not a folder.
+  without making sure it's not a folder (boo#1217009).
 
 -------------------------------------------------------------------
 Sun Jun  5 00:03:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
diff --git a/cmake.spec b/cmake.spec
index 4257e49..0004479 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -85,10 +85,15 @@ Requires:       cmake-implementation = %{version}
 # fatal error: libuv version too new: running with libuv 1.X+1 when compiled with libuv 1.X will lead to libuv failures
 %requires_eq  libuv1
 %endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1500
+%define pyver 311
+%else
+%define pyver 3
+%endif
 %if %{with full} || %{with mini}
 Requires:       make
 # bnc#953842 - A python file is shipped so require python base so it can be run.
-Requires:       python3-base
+Requires:       python%{pyver}-base
 Conflicts:      cmake-implementation
 Provides:       cmake-implementation = %{version}
 %endif
@@ -101,7 +106,7 @@ BuildRequires:  pkgconfig(libarchive) >= 3.3.3
 BuildRequires:  pkgconfig(libcurl)
 %endif
 %if %{with gui}
-BuildRequires:  python3-Sphinx
+BuildRequires:  python%{pyver}-Sphinx
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Widgets)
 %endif