diff --git a/cmake-3.29.6-SHA-256.txt b/cmake-3.29.6-SHA-256.txt deleted file mode 100644 index 7ff7988..0000000 --- a/cmake-3.29.6-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -6202fac4a0a9cc6da7e7fd91599e2a25692ce648ca93115ada7adde6e13d7ce8 cmake-3.29.6-files-v1.json -cd1e96e9337521197a7e9ca29005c6ee36dac702d31c44737122a8e42277c468 cmake-3.29.6-linux-aarch64.sh -4d6b0a551db9da7a034a09372f716cf2094413d7fd8a787051854154b0b3b343 cmake-3.29.6-linux-aarch64.tar.gz -6e4fada5cba3472ae503a11232b6580786802f0879cead2741672bf65d97488a cmake-3.29.6-linux-x86_64.sh -28fef61e64840b784da6db35218fd3ae179ff8bf0be1c8a9d075d6185a0e4fdc cmake-3.29.6-linux-x86_64.tar.gz -f3a618ed177ac7ef5869659bcee9a5978465ffa989ace2844bb679d1b22dae06 cmake-3.29.6-macos-universal.dmg -c3029b29fa47747b69a1e0d3466af62b26af9ff6a5f10608a3bcdcc076810e4c cmake-3.29.6-macos-universal.tar.gz -cc2db7ab8213470f3c4db55a66d69bca08588ba67f9bcfa0899a4876bdd12f6d cmake-3.29.6-macos10.10-universal.dmg -a65f9e66c63bb79f3b6f00e4b67367b6f6c40030ee41cf06580818a74a84b3e9 cmake-3.29.6-macos10.10-universal.tar.gz -39c355f180814b501f64a3ba1b395a467443c12bd5d5c8d9335989158fdbdbde cmake-3.29.6-windows-arm64.msi -8f0df498d8b1a076fc9305dde5a06427262a0476e89d4c670a49147b0bc30761 cmake-3.29.6-windows-arm64.zip -f0e745618580fb4adb0858d9b961be272500bd80b5bce5591b0ebd8e858b3819 cmake-3.29.6-windows-i386.msi -aca4abb4ad7eb7d97647a572132735af2bd35687826e96f7d23dd7f4d2d7d4a9 cmake-3.29.6-windows-i386.zip -b93ec89d545c39b7bad421bcdecace9faac6483a3ce5bfa24cb948ac07adbc48 cmake-3.29.6-windows-x86_64.msi -5c648eac06c33477e510bae14ce1f969e9abb38992b71f245633b182fccb474d cmake-3.29.6-windows-x86_64.zip -1391313003b83d48e2ab115a8b525a557f78d8c1544618b48d1d90184a10f0af cmake-3.29.6.tar.gz -79e2fc075b2aa1d93bea55b606a6a053c77c964d30319ba972046bf6cd327d11 cmake-3.29.6.zip diff --git a/cmake-3.29.6-SHA-256.txt.asc b/cmake-3.29.6-SHA-256.txt.asc deleted file mode 100644 index f9ca741..0000000 --- a/cmake-3.29.6-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmZwjB4ACgkQLSzvEDSS -FoSc6RAAnwLxcYrVtPQJUVURDShbt7JU6XjhadymMW0ThJ0sflLGe1kb6wwVvhXS -wyu6c80gytIPfjlPX5+jWVNk1xBJjiU6VQxsHfeOHOg4Gu5JcStru3TFVsD/vXbC -sBlnjqeP1pwsPx9RI8e5RXgRm4ydnykMVhPqY8IPOQ6kslYljVJ62ICWe/Zv4qhZ -Z4TsPm1lYKuST6wFuMrIviJdK9CTNsX+OSbykQSrPSdACEWx1OEKYsEOb5Xzjb1Q -vc6w18xyBy5VV20EtYy4yUYykpWuVNej9lNmDdhxWEioBWLmZLWBphgUECHc4Jto -5GTvM7iCDkxeJ42RVq3JZKMNXy/oZK7wJPrBtQvwslaYz5Q3NbgFq3Fhp1QsLm6B -D4p/TWnMc6Lp2rDHwk0uunewOJT8d9JI14sdEluH+BAVXa7mFzJ9bCaQLxoPinQ7 -qesXk/agRw5FTd/yQ3vqJCLyj4ONw6QTlmlemMm781p08+ngeOXw+MnwQzsGlVfO -jOxyQvBkHl0g6ViX4IVVOqqjscbvzd3vR4HVa8bHdjssaEGiFVlV43Hk5NbNMkMe -6SLYvuIZMunVbTuAjcHTtQL1Gpr42zA8Y/iL51+KFc8a92sWimcpq+oJf2GOUVCp -qnySsm7wNKDUSHz9JeY8Duez2wJ9fcOgKbUSPegzvsyIdwOCcMg= -=cyLM ------END PGP SIGNATURE----- diff --git a/cmake-3.29.6.tar.gz b/cmake-3.29.6.tar.gz deleted file mode 100644 index 3a1dff3..0000000 --- a/cmake-3.29.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1391313003b83d48e2ab115a8b525a557f78d8c1544618b48d1d90184a10f0af -size 11248411 diff --git a/cmake-3.30.0-SHA-256.txt b/cmake-3.30.0-SHA-256.txt new file mode 100644 index 0000000..b8407a7 --- /dev/null +++ b/cmake-3.30.0-SHA-256.txt @@ -0,0 +1,17 @@ +249f4cd4367b5e48e8b45f2ab1f5ef80a081f7604d2fa9b4ac0684a66cb644ee cmake-3.30.0-files-v1.json +daa89552fd9102fb70399b31b5605c4f61125023bbbed947757a7b53ce36c4d0 cmake-3.30.0-linux-aarch64.sh +3db7f12dadc91be9b30f0e5a71038c51d7f5b7cc03e32625621a052e9996bef0 cmake-3.30.0-linux-aarch64.tar.gz +1a5969fe81fea6e5220d053d9d3e3754cbc85be07d2d428bebdcfe87137971a9 cmake-3.30.0-linux-x86_64.sh +09846a3858583f38189b59177586adf125a08c15f3cddcaf7d7d7081ac86969f cmake-3.30.0-linux-x86_64.tar.gz +adae71da754bb32f2ff9fad17f26e4a1aaeafd589f39bf50945e932f3c3ec160 cmake-3.30.0-macos-universal.dmg +5fd0550f6a1ce1b88276a6d828483e8ddbf5e14053b32a0e534e95294ba3a2e3 cmake-3.30.0-macos-universal.tar.gz +7050c658978b524d00a87bb93cd8ef660e13624c2b0c01499fc8bc4ee26b571a cmake-3.30.0-macos10.10-universal.dmg +54f237212362efa3f192508eeb25d98f2150779ed45c46a77fe356597c3d2749 cmake-3.30.0-macos10.10-universal.tar.gz +5a02a7d0a6a97cc7d8b52efecafc969a6e114cfbf452e65c80e7dad5bb39f736 cmake-3.30.0-windows-arm64.msi +cb8fb65a8f523daa0ce6c531407ae10fcab8d0eefe18a6ef9fb718c54307d6e3 cmake-3.30.0-windows-arm64.zip +7252c7c4059bf99707f284ca58b46c7ecf8d9cc8d0e82a74dcbe90b870ae44d2 cmake-3.30.0-windows-i386.msi +8c7eeafdc58ff7220ab9d69fc90464ac6b7ce5a2d563beacdf42e1e63d201d3c cmake-3.30.0-windows-i386.zip +4ac685654408439f0af2e3bb9d1e8eda9d5a9ac1508870f2c93e31028aee9a9e cmake-3.30.0-windows-x86_64.msi +f8d2da0eaf3bab9cf065e97bd6d8e1819886f8671d3d4c7bb93cb774123fa448 cmake-3.30.0-windows-x86_64.zip +157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579 cmake-3.30.0.tar.gz +6340b67c9b902ab43ca0906305c3a6fd85edb47dae7236e5a0365af6defb12b9 cmake-3.30.0.zip diff --git a/cmake-3.30.0-SHA-256.txt.asc b/cmake-3.30.0-SHA-256.txt.asc new file mode 100644 index 0000000..88b95ae --- /dev/null +++ b/cmake-3.30.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmaEGUIACgkQLSzvEDSS +FoTkSBAAjCAqnyn4VB1U1wnH3LDGAbWFKyq0hlDLZ4NDzr/78AmfxQzDmOC8wdpC +3pXYTBF7QtIZLe/a4UL8ZzPHXLbpKjSers2fpDhSodAYBND/k8xdElynssnZaxyc +zF2AzRTcn3vv2yEDfSMVq0j4fvme8JBAx5Gn2rek+M5Rv+nyKAdur8CQeN7RThy9 +M/7RZArO+NF85V4UqIoVEQvxpQ7AxDcSDr5hGAAPckTIAp/fNXzK/nG3w0tu22iG +dGQdeZOv1caYOaxyxz3xeVlWpmI6A4DxBmeNn3KSxjO3nRVbS9gLZaTXUx89T6AG +g7zNiR+TuJOglZW8VjMtu7jqm+2lWIAjAnB7VobuIlyf7Pmjy1iv0sn3sCVA/KUH +vqDAcY2LrNyDDDA2YfhJqDQg+P58g/2gzpqmhCDEvh3Vd9LbkEMFHhlGdm/jBSS1 +mNSasULiRiLlq85tqkaBCrn+jhvQMukAqe5NKrfxsHVTjrMeS+Nn2AqtAPOMdKaO +AACXxnAyV/seRFwrd1fG1Ua6CyziDHAGTfstbDgruhMUAsCFpFog7eTE+tFYeiFG +M+ZorxK893CAv4nS/jRVx62NxyBqdOBqsxbdNELCSdi7eJsK1nDfyfINMrYi5jaU +8QIQA8IKXJ0uIUHMaLLQXzx3Tp4K5RA08+U3KVivEBpTp800FTY= +=QJbX +-----END PGP SIGNATURE----- diff --git a/cmake-3.30.0.tar.gz b/cmake-3.30.0.tar.gz new file mode 100644 index 0000000..369ecaa --- /dev/null +++ b/cmake-3.30.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579 +size 11500060 diff --git a/cmake-fix-test-without-git.patch b/cmake-fix-test-without-git.patch new file mode 100644 index 0000000..444046e --- /dev/null +++ b/cmake-fix-test-without-git.patch @@ -0,0 +1,43 @@ +From fe8dc3012eca70ed1ecc1774466c7eb5bee6e8c1 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 3 Jul 2024 10:40:07 -0400 +Subject: [PATCH] Tests: Fix RunCMake.ExternalProject when git is not available + +Move Git-dependent test cases added by commit 2ef3bd9186 +(ExternalProject: Add TLS version options for https connections, +2024-02-26, v3.30.0-rc1~471^2) into the block of cases that run only +when Git is found. + +Fixes: #26104 +--- + Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake +index 3c7cd68e7e7..98e3996c892 100644 +--- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake ++++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake +@@ -15,9 +15,6 @@ endif() + + run_cmake(BadIndependentStep1) + run_cmake(BadIndependentStep2) +-run_cmake(TLSVersionBadArg) +-run_cmake(TLSVersionBadVar) +-run_cmake(TLSVersionBadEnv) + run_cmake(NoOptions) + run_cmake(SourceEmpty) + run_cmake(SourceMissing) +@@ -256,5 +253,9 @@ if(GIT_EXECUTABLE) + # on some platforms. It may go to stdout or stderr, so force it to be merged. + set(RunCMake_TEST_OUTPUT_MERGE TRUE) + run_cmake(FetchGitRefs) +- set(RunCMake_TEST_OUTPUT_MERGE FALSE) ++ unset(RunCMake_TEST_OUTPUT_MERGE) ++ ++ run_cmake(TLSVersionBadArg) ++ run_cmake(TLSVersionBadVar) ++ run_cmake(TLSVersionBadEnv) + endif() +-- +GitLab + diff --git a/cmake.changes b/cmake.changes index 5a24df0..a5b5cae 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Jul 3 05:50:53 UTC 2024 - Christoph G + +- udate to 3.30.0 + * "cmake-presets(7)" files now support schema version "9". + "include" fields now expand all macros except "$env{}" and + preset-specific macros, i.e., those derived from the fields + inside a preset's definition. + * The "Compile Features" functionality now implements support + for the "cxx_std_26" and "cuda_std_26" meta-features to + indicate that the compiler mode must be at least C++26. + * The "CMAKE__STANDARD_LATEST" variable was added to + describe the latest "" language standard CMake supports + for the selected compiler. + * The "CMAKE_TLS_VERSION" variable and "CMAKE_TLS_VERSION" + environment variable were added to specify a default minimum + TLS version for connections to "https://" URLs by the + "file(DOWNLOAD)" and "file(UPLOAD)" commands. + * The "GENERATED" source file property is now visible in all + directories. See policy "CMP0163". Policy "CMP0118"'s + documentation has been revised to describe its actual effects. + * The "TARGET_PROPERTY" generator expression learned to evaluate + custom transitive properties. + * The "CPack WIX Generator" gained support for WiX Toolset v4. + See the "CPACK_WIX_VERSION" variable. + * The "FindBoost" module has been removed by policy "CMP0167". + Port projects to upstream Boost's "BoostConfig.cmake" package + configuration file, for which "find_package(Boost)" now + searches. +- Add cmake-fix-test-without-git.patch to fix test #567 to be run + conditionally when Git is found, upstream planned for 3.30.1 + ------------------------------------------------------------------- Wed Jun 19 07:56:40 UTC 2024 - Dirk Müller diff --git a/cmake.macros b/cmake.macros index 9241ec7..181e098 100644 --- a/cmake.macros +++ b/cmake.macros @@ -77,6 +77,6 @@ DESTDIR=%{buildroot} %__builder install -C %__builddir %ctest(:-:) \ - cd %__builddir \ - %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \ + cd %__builddir && \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** ; \ cd .. diff --git a/cmake.spec b/cmake.spec index e676587..22b3ea9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -45,14 +45,14 @@ %else %bcond_with full %endif -%define shortversion 3.29 +%define shortversion 3.30 %if 0%{?suse_version} && 0%{?suse_version} <= 1500 %define pyver 311 %else %define pyver 3 %endif Name: cmake%{?psuffix} -Version: 3.29.6 +Version: 3.30.0 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -70,6 +70,8 @@ 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 Patch2: cmake-zerojvm.patch +# Fix test #567 to be run conditionally when Git is found, upstream, planned for 3.30.1 +Patch3: cmake-fix-test-without-git.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig