From 872155526188ea8e21ac4e738e4c8528ae5cbe7a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 24 Jun 2025 09:46:35 +0000 Subject: [PATCH] import UBI cmake-3.30.5-3.el10_0 --- cmake.spec | 5 ++++- macros.cmake.in | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 09e29a3..b94e503 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 5 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -552,6 +552,9 @@ popd %changelog +* Fri Apr 04 2025 Tom Stellard - 3.30.5-3 +- macros: Fix missing asterisk in ctest macro + * Tue Nov 05 2024 Tom Stellard - 3.30.5-2 - Fix conflicting license files in cmake and cmake-doc diff --git a/macros.cmake.in b/macros.cmake.in index 675ca90..fa7e967 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -50,7 +50,8 @@ %ifarch riscv64 \ --timeout 6000 \\\ %endif \ - %{?_smp_mflags} %{**} + %{?_smp_mflags} \\\ + %{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake