diff --git a/cmake-3.30.3-SHA-256.txt b/cmake-3.30.3-SHA-256.txt deleted file mode 100644 index 28452a8..0000000 --- a/cmake-3.30.3-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -408aa6889fc25fea8c5280065f4eeac3e330d66bae2a212630cf4353f886c781 cmake-3.30.3-files-v1.json -43d5882e5db6d4331d3097d3a4ff92e53cd19987e7da9ffa6c833d22f9ca7aaa cmake-3.30.3-linux-aarch64.sh -420f17c58de4ed8b53c1055a34318aec5c06d94b04dac9dd3c72861dfdc99d52 cmake-3.30.3-linux-aarch64.tar.gz -54f93e25d728b742f9ffb51d7093b883ee4332d9923b427e39f8f46fb74d6e68 cmake-3.30.3-linux-x86_64.sh -4a5864e9ff0d7945731fe6d14afb61490bf0ec154527bc3af0456bd8fa90decb cmake-3.30.3-linux-x86_64.tar.gz -f5aabecc73d9d373d298ca1f13798f36b4cc96932cc86ea4e3833442508bb99d cmake-3.30.3-macos-universal.dmg -cec873b2822f1c34bc3e2fd6ec9fdd1c4c6bc850edfeba47524f23cdfeb1c8c4 cmake-3.30.3-macos-universal.tar.gz -9c967b068be1744910a1f604f2cc78d5b0a67a8609baf3fc3dbadf92f8c2b3e4 cmake-3.30.3-macos10.10-universal.dmg -8ebca4b3cea5c7f39f5bff8ad1ca9b7e8267d758375955f8f14f385d6827fc2e cmake-3.30.3-macos10.10-universal.tar.gz -b6061598d6bd10089b07db3f0cce1a36202ec28fe1b0a4564f1c4535c8edba3c cmake-3.30.3-windows-arm64.msi -8b35d500f6c33383385990405e4a3d307c570e5a0043eab9b781422b078637de cmake-3.30.3-windows-arm64.zip -f7e05fb104fed42db7581a8dc25ecddfa432d8d3595d3ed9e8c9386837416c30 cmake-3.30.3-windows-i386.msi -5e4464a6d5af15e1a45fa376ac03b6bd63b35b7d93a2e93a2dd6215b39513a3f cmake-3.30.3-windows-i386.zip -097900d46f393432a518f91e0145410e99b2fb7dc2a8e807aeafeeaefd40e080 cmake-3.30.3-windows-x86_64.msi -2b339f738d3dea408d1523c99bb24d2d82b169f5749a698225ecfdf2f0d1c314 cmake-3.30.3-windows-x86_64.zip -6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4 cmake-3.30.3.tar.gz -64dedbc7bd0433c072371bca0b03fd9f0a7d2b559c98816a7967197417780e8e cmake-3.30.3.zip diff --git a/cmake-3.30.3-SHA-256.txt.asc b/cmake-3.30.3-SHA-256.txt.asc deleted file mode 100644 index 243f818..0000000 --- a/cmake-3.30.3-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmbQ1eoACgkQLSzvEDSS -FoTD3xAAmxkdm6M1K78LpyamxREi7yIu+g/OAhh6KzBRbEr3LdaugS17Emx+QBE+ -T4XOgzjv1fnDn1Tv/90Mk1onQi+gCoLO+uCLzBJ6Tag2esCzJRrwL47KGwIJYO5L -qFvxPU8SGK3cLzeQSuTSka07mUf9lXMoVj8TSIRc3/ZqrIHLK5MHQmVVUoi5y50T -DgHzPz3nrge8O8Rmrs7UPfiDYmWkOWdGlErDdiSlIBwLUPeGMZQl7W5TM3HoALTG -NEZwjhlgTDt3lRkQsYvCQdd/N4NMUlbCyW/IrIuhaXmhGoYYxUGBky4zSOg0koYw -mQB6pmL7WVElMCPUnBdxjeyK4wL83gb/l2dXL4EQ0pJH/oKUQrQPSnO/DWhfBMqv -jw6z9dzgBDr1K02A01zx6FLwJl9Bmu22SBQSYk42Pc8Y3v/05blX7MudPumfNaYh -AAjMJ9TBQI+gqfIlvSWRHaR71KnCm2new9fCt3GA1XP4P5ChujtjL7vVzBIXFkVt -MGZCp+z44DDfoUViRWp37FSFInFqn9wz89/Mxmp2oW9A29w4GOob8XuIt0prWwds -T8E0NLcLcZC4zJfhVtZfQC52uEDVpaSOgbzODC+3bovtrgW/lM22fdksNPCxF8Oy -XQUwGDKJHHy2uxc8Jludy3ss1PSwpk3cu5Yiuto5uTrmZYUtA4Y= -=uwIX ------END PGP SIGNATURE----- diff --git a/cmake-3.30.3.tar.gz b/cmake-3.30.3.tar.gz deleted file mode 100644 index cde7503..0000000 --- a/cmake-3.30.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4 -size 11501292 diff --git a/cmake-4.0.3-SHA-256.txt b/cmake-4.0.3-SHA-256.txt new file mode 100644 index 0000000..73a40c1 --- /dev/null +++ b/cmake-4.0.3-SHA-256.txt @@ -0,0 +1,21 @@ +d737ed6a42c2a29217460850670fd064d93fc960ed49e9fbd4171c7e2842febd cmake-4.0.3-files-v1.json +dd53deec25f826d7c96d62825224329c845150c0eee2729c6a2a069c99891146 cmake-4.0.3-linux-aarch64.sh +391da1544ef50ac31300841caaf11db4de3976cdc4468643272e44b3f4644713 cmake-4.0.3-linux-aarch64.tar.gz +1d15a366ce6a5191f26ca23b3c7ae6f5690ffa63fa87ffbea4b92fb27e7c6170 cmake-4.0.3-linux-x86_64.sh +585ae9e013107bc8e7c7c9ce872cbdcbdff569e675b07ef57aacfb88c886faac cmake-4.0.3-linux-x86_64.tar.gz +57faffb8e9a159707998c09c3b40f07a1e8dfca7eb518416a60bf8379bff399d cmake-4.0.3-macos-universal.dmg +4e85de4daf1c3e82d7dc6b8ba5683972944b466343aeb9c327a742437bb3ce9a cmake-4.0.3-macos-universal.tar.gz +7a3526943eef52181704c4edd2bedb8f5573dd527a4a5fb70f35d6010e2cf550 cmake-4.0.3-macos10.10-universal.dmg +31f1d30f47ce1ac25168a70635c2a9160a1a7b54b28f7efac8e8d3c9154add45 cmake-4.0.3-macos10.10-universal.tar.gz +85adcdd558d552c661d3481c8446f61ded595deae038652270e618afb9ded4dd cmake-4.0.3-sunos-sparc64.sh +60ef9ffa8a72342d48166a7b575493be08955341172165c21785c018ab084104 cmake-4.0.3-sunos-sparc64.tar.gz +770e77377f37e0094673eccf1770abee79d28dbb6903e2ea8acfabdb1dfddba1 cmake-4.0.3-sunos-x86_64.sh +d566846125cc2309fcf2e249e60cbe98ec9451b4f9d65ba462a8fbfb771be11e cmake-4.0.3-sunos-x86_64.tar.gz +0cc0b1db0e0ecbf71457bc84bf0b832bc5293f53b0f65a291f501ec9f04fcf30 cmake-4.0.3-windows-arm64.msi +86ccd6485bbd4bb41a1a858db397be5bca5e0de96858bf8dbba7a64407bd6c00 cmake-4.0.3-windows-arm64.zip +56f77f1d9ec51a109d17d07c73d3bb1269dcaf0ea2772c1623c6bd9a6b3760a5 cmake-4.0.3-windows-i386.msi +9f71df30cf0194f7214d135afb277017bd4a58baba2ae14e6ae8b0533b5a3dbf cmake-4.0.3-windows-i386.zip +589da314f09f2b7a28a79932ee33e95b388b0749a6799d887139189864f9798f cmake-4.0.3-windows-x86_64.msi +b59a31dfbfa376a4aaea9ff560ff2b29f78ee5f9fb15447fc71ae7bf9fea9379 cmake-4.0.3-windows-x86_64.zip +8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb cmake-4.0.3.tar.gz +398c49dfe07aa9bfce0f9c0ab29d1492046b9ea8ed28a54e298fc35ca63e0b65 cmake-4.0.3.zip diff --git a/cmake-4.0.3-SHA-256.txt.asc b/cmake-4.0.3-SHA-256.txt.asc new file mode 100644 index 0000000..ad32f47 --- /dev/null +++ b/cmake-4.0.3-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmhK63gACgkQLSzvEDSS +FoSZSxAAlhkoVltYOViltczo5L9JfZ1y0EcwsIEAjKcsRfEU1HlIIL4uoebj6s41 +gpeiNqre+Axk2Xktw+tkP9izfTVYhMNGI5Jw2AMu9skG0SYi0n6gdlwlndKE0EwU +5bufwQrjgL9YxhHhED1FJchosw8PsDodcCL2LKBHuNBoNvGv/qQSsnOx/baZGPqI +wTq8TWa4/JxJPuK/j/Lk69IpF9KEzlxjP/yCC8jAe7VFOWdQ2h3HJhEw7dwnQtY+ +nT/DcnoLtMzG6IQtonSR6lxeACId2h+W2y5kuUGzmhOw42xqglCKY8E1v3ELz0CQ +gSCTnWTS1zvbmgrgmudtjQ9FFf2bFfhtGQfqUsew2dxh5e6ThP30Io9Ci4+LiNZv +VH8j/w1uJtAJFQumUKsH33CuM3NkzPzIYXEVDvU8k9J1a22yhiEiRytFllU1VwDd +Mmq2Js7vy9DnWMl4ch2WR+e/xjEXDp7Is8NevBkb70aOSLchEdm/uqzSsQ5BG81P +WV1QhPjucMAP8iJTZKon3QwbZFFf0A2FkXzz++b/a/nGY3d2xw3320PTW9DuGsLO +n8L/UBXzJoeWuG4OSaGWNRU0rWYZ/Pg8vFbH/CsrMIAUW72wpIXrdepognqL1TR/ +drj4W0VsIAdyB3vwG2iB1u/18PWzScl74tQ6zWBqq/2TVSlm/I0= +=HFdV +-----END PGP SIGNATURE----- diff --git a/cmake-4.0.3.tar.gz b/cmake-4.0.3.tar.gz new file mode 100644 index 0000000..561c579 --- /dev/null +++ b/cmake-4.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb +size 11830216 diff --git a/cmake-findhdf5-prefer-hl-compilers.patch b/cmake-findhdf5-prefer-hl-compilers.patch new file mode 100644 index 0000000..2d91686 --- /dev/null +++ b/cmake-findhdf5-prefer-hl-compilers.patch @@ -0,0 +1,38 @@ +From a869b79c5921412c91fb71a761748ae5f7d3fb23 Mon Sep 17 00:00:00 2001 +From: Atri Bhattacharya +Date: Mon, 10 Mar 2025 20:55:36 +0530 +Subject: [PATCH] FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL + +Prefer `h5hlcc`, `h5hlc++`, and `h5hlfc` compilers when HDF5's HL libraries +are requested. These include the `-lhdf_hl` in the command line, whereas +the non-hl compilers (like `h5cc`) do not. Using the latter, therefore, +leads to cmake complaining about not finding the `HDF5_HL` libraries even +though they are present in the same location as the `hdf5` library itself. + +Fixes: #23261 +--- + Modules/FindHDF5.cmake | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake +index 2f0c3c1665..89058ca2be 100644 +--- a/Modules/FindHDF5.cmake ++++ b/Modules/FindHDF5.cmake +@@ -218,6 +218,13 @@ else() + set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc) + endif() + ++# Prefer h5hl compilers if HDF5_FIND_HL is enabled ++if(HDF5_FIND_HL) ++ list(PREPEND HDF5_C_COMPILER_NAMES h5hlcc) ++ list(PREPEND HDF5_CXX_COMPILER_NAMES h5hlc++) ++ list(PREPEND HDF5_Fortran_COMPILER_NAMES h5hlfc) ++endif() ++ + # Test first if the current compilers automatically wrap HDF5 + function(_HDF5_test_regular_compiler_C success version is_parallel) + if(NOT ${success} OR +-- +GitLab + + diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index 1ac94b2..9fb4704 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -1,13 +1,13 @@ -Index: cmake-3.26.2/Modules/FindRuby.cmake +Index: cmake-4.0.0/Modules/FindRuby.cmake =================================================================== ---- cmake-3.26.2.orig/Modules/FindRuby.cmake -+++ cmake-3.26.2/Modules/FindRuby.cmake -@@ -313,7 +313,7 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +--- cmake-4.0.0.orig/Modules/FindRuby.cmake ++++ cmake-4.0.0/Modules/FindRuby.cmake +@@ -286,7 +286,7 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) # vendor_ruby available ? - execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" + execute_process(COMMAND ${Ruby_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?" - OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) + OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) - if(Ruby_HAS_VENDOR_RUBY) + if (Ruby_HAS_VENDOR_RUBY) diff --git a/cmake.changes b/cmake.changes index 0e37858..7b4bc40 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,197 @@ +------------------------------------------------------------------- +Wed Jun 18 12:04:17 UTC 2025 - Simon Lees + +- Set -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix a bunch of build + issues. + +------------------------------------------------------------------- +Mon Jun 16 21:14:47 UTC 2025 - Christoph G + +- update to 4.0.3 + * CUDA/Clang: Fix list of architectures supported by Clang < 20.1, + Reorder the logic for setting supported archs, add archs + supported by Clang 21 + * gcc: support `import std` + * experimental: recycle the `import std` UUID + * Clang/CXXImportStd: support `-stdlib=libstdc++` + * experimental/CXXModules: recycle the UUID + * FindPython: rely on ABIFLAGS on Windows for ABI profile + * FindPython: Avoid implicit link library on Windows + +------------------------------------------------------------------- +Wed May 28 18:49:13 UTC 2025 - Bernhard Wiedemann + + - Replace usage of %jobs for reproducible builds (boo#1237231) + +------------------------------------------------------------------- +Tue May 20 20:45:39 UTC 2025 - Andreas Stieger + +- fix GUI build on openSUSE Leap 15.x + +------------------------------------------------------------------- +Wed Apr 16 21:31:21 UTC 2025 - Christoph G + +- update to 4.0.1 + * get_filename_component: Restore lexical preprocessing of + REALPATH for compat + * find_package: Restore component requirements in nested calls + * Source: Include specific CoreFoundation headers instead of + umbrella header + +------------------------------------------------------------------- +Tue Apr 16 17:27:57 UTC 2025 - Christoph G + +- update to CMake 4.0 + * The "CMAKE_POLICY_VERSION_MINIMUM" variable was added to help + packagers and end users try to configure existing projects that + have not been updated to work with supported CMake versions. + * The "$" generator expression gained the "NATIVE_PATH" + operation to convert a CMake path into a native one. + * Compatibility with versions of CMake older than 3.5 has been + removed. + * The "cmake --link-no-warning-as-error" option was added to + suppress the effects of the "LINK_WARNING_AS_ERROR" target + property and "CMAKE_LINK_WARNING_AS_ERROR" variable. + * The "target_link_libraries()" command now supports the + "LINKER:" prefix. +- adjust cmake-fix-ruby-test.patch + +------------------------------------------------------------------- +Fri Apr 11 15:23:54 UTC 2025 - Andreas Stieger + +- update to 3.31.7: + * fix FindCUDAToolkit doesn't find CUPTI in CUDA installations + from runfile + * fix file(MAKE_DIRECTORY): creates RESULT and folders + * fix Wrong detection of LINKER_PUSHPOP_STATE_SUPPORTED + * fix cmake-gui: Invalid error message "Error: could not load cache" + * fix build with curl 8.13.0 (boo#1241036) + +------------------------------------------------------------------- +Wed Mar 26 14:14:39 UTC 2025 - Atri Bhattacharya + +- Switch cmake-gui builds to Qt6. +- Add BuildRequires: qt6-macro to locate qhelpgenerator (in + %_qt6_libexecdir) and add corresponding path to env PATH. +- Drop use of deprecated %suse_update_desktop_file macro and + BuildRequires: update-desktop-files needed solely for this. + +------------------------------------------------------------------- +Tue Mar 11 06:54:19 UTC 2025 - Atri Bhattacharya + +- Add cmake-findhdf5-prefer-hl-compilers.patch -- FindHDF5: Prefer + h5hl* compilers for HDF5_FIND_HL; patch submitted upstream + [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch]. + This fixes hdf5_hl detection issues when building hdf5 >= 1.14 + using cmake instead of autotools. + +------------------------------------------------------------------- +Fri Feb 28 20:22:35 UTC 2025 - Dirk Müller + +- temporarily revert "make %cmake_{build, install} call cmake + directly" as the fall out is too large. will be restored once + fallout can be mitigated + +------------------------------------------------------------------- +Tue Feb 25 06:17:14 UTC 2025 - Christoph G + +- update to 3.31.6 + * cmGeneratorExpressionDAGChecker: Construct with initializer + list syntax, De-duplicate constructor signature, Construct + with initializer list syntax + * GenEx: Restore evaluation context for conditional transitive + properties, Fix evaluation of LINK_LIBRARIES as custom + transitive property + * GoogleTest: Restore support for spaces in explicit + WORKING_DIRECTORY + +-------------------------------------------------------------------- +Wed Feb 19 00:34:48 UTC 2025 - Yoong Jin + +- make %cmake_{build, install} call cmake directly + to auto set generator so that %global + are no longer needed to set generators + +------------------------------------------------------------------- +Tue Jan 14 14:33:12 UTC 2025 - Christoph G + +- update to 3.31.4 + * LFortran: Remove hard-coded --generate-object-code flag + * FindBoost: Add support for Boost 1.87 + +------------------------------------------------------------------- +Sat Dec 21 12:51:12 UTC 2024 - Christoph G + +- update to 3.31.3 + * cmLocalUnixMakefileGenerator3: Simplify progress command + generation + * Makefile: Fix per-directory codegen target + * Makefile: Enable progress messages for codegen target + * cmGlobalNinjaGenerator: Fixes and improvements + +------------------------------------------------------------------- +Fri Dec 6 18:07:29 UTC 2024 - Christoph G + +- update to 3.31.2 + * GNU linker: Use single-argument form of --dependency-file flag + * fileapi: Do not expose flags for linker-generated dependencies + * LINK_OPTIONS: Fix crash on empty LINKER: prefix + * FindRuby: Add support for 3.4 + +------------------------------------------------------------------- +Tue Nov 26 20:10:59 UTC 2024 - Christoph G + +- update to 3.31.1 + * FindBoost: Add support for Boost 1.86 + * libarchive: Update script to get 3.7.7 + * execute_process: Restore CLOEXEC on OUTPUT_FILE and + ERROR_FILE descriptors + * LLD linker: avoid regression on archive libraries deduplication + +------------------------------------------------------------------- +Thu Nov 7 17:56:10 UTC 2024 - Christoph G + +- update to 3.31.0 + * cmake-presets(7) files may now include comments using the key + "$comment" at any level within the JSON object to provide + documentation. + * The Ninja Generators and Makefile Generators now produce a + "codegen" build target. + * The "CMAKE_LINK_LIBRARIES_STRATEGY" variable and corresponding + "LINK_LIBRARIES_STRATEGY" target property were added to + optionally specify the strategy CMake uses to generate link + lines. + * The "CMAKE_EXPORT_BUILD_DATABASE" variable, a corresponding + "CMAKE_EXPORT_BUILD_DATABASE" environment variable, and an + "EXPORT_BUILD_DATABASE" target property, were added to enable + exporting C++ module compile commands. This is only supported + with Ninja Generators. + * The "CMAKE__HOST_COMPILER_ID" and + "CMAKE__HOST_COMPILER_VERSION" variables were added, + where "" is either "CUDA" or "HIP". They are populated + when "CMAKE__COMPILER_ID" is "NVIDIA" to identify NVCC's + host compiler. + * The "file(DOWNLOAD)" and "file(UPLOAD)" commands now verify TLS + server certificates for connections to "https://" URLs by + default. + +------------------------------------------------------------------- +Wed Oct 23 08:36:43 UTC 2024 - Dirk Müller + +- update to 3.30.5: + * project: Only check non-cache vars when setting project vars + +------------------------------------------------------------------- +Fri Sep 27 22:19:53 UTC 2024 - Christoph G + +- update to 3.30.4: + * FetchContent: Don't update verify script timestamp if it + doesn't change + * project: Only define non-cache vars if already defined + * librhash: aligned_alloc is not available with glibc < 2.16 + * FindPython: ensure all ABI are searched by default + * FindMatlab: multiple fixes for MCR + ------------------------------------------------------------------- Fri Aug 30 05:02:09 UTC 2024 - Christoph G diff --git a/cmake.macros b/cmake.macros index 181e098..b7f9803 100644 --- a/cmake.macros +++ b/cmake.macros @@ -57,7 +57,8 @@ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ - -DCMAKE_MODULES_INSTALL_DIR=%{_libdir}/cmake/%{name} + -DCMAKE_MODULES_INSTALL_DIR=%{_libdir}/cmake/%{name} \\\ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 %__builder_verbose \ %if "%__builder" == "%__make" \ diff --git a/cmake.spec b/cmake.spec index b6b5281..4c840c4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,8 +1,8 @@ # # spec file for package cmake # -# Copyright (c) 2024 SUSE LLC -# Copyright (c) 2024 Andreas Stieger +# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,14 +45,14 @@ %else %bcond_with full %endif -%define shortversion 3.30 +%define shortversion 4.0 %if 0%{?suse_version} && 0%{?suse_version} <= 1500 %define pyver 311 %else %define pyver 3 %endif Name: cmake%{?psuffix} -Version: 3.30.3 +Version: 4.0.3 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -69,6 +69,8 @@ Source99: README.SUSE Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch +# PATCH-FIX-UPSTREAM cmake-findhdf5-prefer-hl-compilers.patch badshah400@gmail.com -- FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL; patch submitted upstream [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch] +Patch2: cmake-findhdf5-prefer-hl-compilers.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -107,11 +109,17 @@ BuildRequires: pkgconfig(libcurl) %if %{with gui} BuildRequires: python%{pyver}-Sphinx BuildRequires: python%{pyver}-base -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: qt6-macros +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Widgets) +%if 0%{?suse_version} < 1600 +# for #include +BuildRequires: gcc12-c++ +%endif %endif %if %{with qhelp} -BuildRequires: libqt5-qttools-qhelpgenerator +BuildRequires: qt6-tools-helpgenerators %endif %description @@ -146,6 +154,10 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC %build cp -p %{SOURCE99} . +%if %{with qhelp} +# Add path to qhelpgenerator +export PATH+=":%{_qt6_libexecdir}" +%endif %if %{with mini} # this is serial, so it takes too much time for the mini package %define _find_debuginfo_dwz_opts %{nil} @@ -153,6 +165,11 @@ cp -p %{SOURCE99} . %endif export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS" +%if %{with gui} +%if 0%{?suse_version} < 1600 +export CXX=g++-12 +%endif +%endif %if "%{flavor}" != "" # This is not autotools configure ./configure \ @@ -168,7 +185,11 @@ export CXXFLAGS="$CFLAGS" --no-system-jsoncpp \ --no-system-libarchive \ %endif - --parallel=0%{jobs} \ +%if 0%{?suse_version} < 1600 + --parallel=0%{jobs} \ +%else + --parallel=${RPM_BUILD_NCPUS:-1} \ +%endif --verbose \ %if 0%{?suse_version} > 1500 --system-libuv \ @@ -194,7 +215,6 @@ export CXXFLAGS="$CFLAGS" mkdir -p %{buildroot}%{_libdir}/cmake %if %{with gui} -%suse_update_desktop_file -r cmake-gui CMake Development IDE Tools Qt # delete files that belong to the 'cmake' package rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest,ccmake} @@ -217,9 +237,6 @@ install -p -m0644 -D %{SOURCE3} %{buildroot}%{_fileattrsdir}/cmake.attr install -p -m0755 -D %{SOURCE4} %{buildroot}%{_rpmconfigdir}/cmake.prov sed -i -e "1s@#!.*python.*@#!$(realpath %{_bindir}/python3)@" %{buildroot}%{_rpmconfigdir}/cmake.prov -# fix: W: files-duplicate (%%license covers already) -rm %{buildroot}%{_docdir}/cmake/Copyright.txt - %fdupes %{buildroot}%{_datadir}/cmake %endif %endif @@ -237,13 +254,11 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt %if %{with qhelp} %files -n cmake-doc-qhelp -%license Copyright.txt %{_docdir}/cmake/CMake.qch %endif %if %{with gui} %files -n cmake-gui -%license Copyright.txt %{_bindir}/cmake-gui %{_datadir}/applications/cmake-gui.desktop %{_datadir}/mime/packages/cmakecache.xml @@ -254,7 +269,6 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt %{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png %files -n cmake-man -%license Copyright.txt %{_mandir}/man7/* %{_mandir}/man1/* @@ -264,7 +278,6 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt %if "%{flavor}" == "" %doc README.SUSE %else -%license Copyright.txt %doc README.rst %{_rpmconfigdir}/macros.d/macros.cmake %{_fileattrsdir}/cmake.attr