diff --git a/cmake.changes b/cmake.changes index b17a52c..7a43dc0 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 11 10:21:03 UTC 2024 - Michal Suchanek + +- Use new enough Sphinx on SLE (jsc#PED-7572 boo#1218125). + +------------------------------------------------------------------- +Thu Jan 11 01:28:45 UTC 2024 - Simon Lees + +- A quick note for the bots that boo#1217009 is already fixed + in tumbleweed + ------------------------------------------------------------------- Wed Dec 27 12:56:45 UTC 2023 - Stefan Brüns @@ -333,7 +344,7 @@ Tue Aug 2 09:04:01 UTC 2022 - Paolo Stivanin Sat Jul 2 07:32:54 UTC 2022 - Christophe Giboudeaux - 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 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