testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 1138115 from home:simotek:branches:devel:tools:building

Browse Source 
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
This commit is contained in:
Simon Lees 2024-01-11 11:35:31 +00:00 committed by Git OBS Bridge
parent 796a383ea3
commit 7485b5ca29
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake.changes
View File

@ -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>

9
cmake.spec
View File

@ -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