cmake-3.30.8

cmake-3.30.7
Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin merge
2025-02-24 19:53:12 +01:00 · 2025-01-26 12:57:17 +01:00 · 2025-01-26 12:57:17 +01:00 · 2025-01-26 12:56:27 +01:00
4 changed files with 19 additions and 17 deletions
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@ -1,7 +1,7 @@
-Index: cmake-3.31.0/Modules/FindRuby.cmake
+Index: cmake-3.30.5/Modules/FindRuby.cmake
 ===================================================================
--- cmake-3.31.0.orig/Modules/FindRuby.cmake
-+++ cmake-3.31.0/Modules/FindRuby.cmake
+--- cmake-3.30.5.orig/Modules/FindRuby.cmake
+++ cmake-3.30.5/Modules/FindRuby.cmake
@@ -312,14 +312,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
   _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
--- a/cmake.spec
+++ b/cmake.spec
@ -68,8 +68,8 @@
 %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}

 %global major_version 3
-%global minor_version 31
-%global patch_version 1
+%global minor_version 30
+%global patch_version 8

 # For handling bump release by rpmdev-bumpspec and mass rebuild
 %global baserelease 1
@ -504,10 +504,6 @@ NO_TEST="$NO_TEST|curl"
 # These three tests timeout on riscv64, skip them.
 NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink|Qt6Autogen.MocIncludeSymlink"
 %endif
-%if 0%{?fedora} == 41
-# Test failing on Fedora 41, only.
-NO_TEST="$NO_TEST|RunCMake.Make|RunCMake.BuildDepends|Qt6Autogen.RerunMocBasic|Qt6Autogen.RerunRccDepends"
-%endif
 bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
 ## do this only periodically, not for every build -- besser82 20221102
 # Keep an eye on failing tests
@ -588,14 +584,18 @@ popd


 %changelog
-* Sun Dec 01 2024 Björn Esser <besser82@fedoraproject.org> - 3.31.1-1
- cmake-3.31.1
-  Fixes rhbz#2324190
- macros: Fix handling of double-dash without argument for ctest
+* Mon Feb 24 2025 Björn Esser <besser82@fedoraproject.org> - 3.30.8-1
+- cmake-3.30.8

-* Fri Nov 08 2024 Björn Esser <besser82@fedoraproject.org> - 3.31.0-1
- cmake-3.31.0
-  Fixes rhbz#2324190
+* Sun Jan 26 2025 Björn Esser <besser82@fedoraproject.org> - 3.30.7-1
+- cmake-3.30.7
+
+* Thu Jan 23 2025 Orion Poplawski <orion@nwra.com> - 3.30.5-3
+- Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin
+  merge
+
+* Sun Dec 01 2024 Björn Esser <besser82@fedoraproject.org> - 3.30.5-2
+- macros: Fix handling of double-dash without argument for ctest

 * Sun Nov 03 2024 Björn Esser <besser82@fedoraproject.org> - 3.30.5-1
 - cmake-3.30.5
--- a/macros.cmake.in
+++ b/macros.cmake.in
@ -28,6 +28,8 @@
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
        -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+        -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\
+        -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\
        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
        -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (cmake-3.31.1.tar.gz) = 9c4664792b32b1fa76aa66c5211e8a0a1fed380eb48ff605adb516d056ae3ab94859cf4103d86b83e220baba3ec5b763b454b6866d6bd606fc558fa3da75b146
+SHA512 (cmake-3.30.8.tar.gz) = bb56b64ca6958a349b43153048a7f9230a6d29571cf4d657b7fbde2ee025b82ab0b884fea014a22b3c8209374a6ca7a801f4b86767a6dbcd6e6971da2e314b79
Author	SHA1	Message	Date
Björn Esser	7c31d43060	cmake-3.30.8	2025-02-24 19:53:12 +01:00
Björn Esser	09c6d04828	cmake-3.30.7	2025-01-26 12:57:17 +01:00
Orion Poplawski	b550da2d27	Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin merge	2025-01-26 12:57:17 +01:00
Björn Esser	9faafbf93c	Revert to cmake-3.30.x series	2025-01-26 12:56:27 +01:00