From aaa289ec8e04448b1b35e24f7b5d9edf0fad135a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 12 Dec 2025 14:28:38 +0100 Subject: [PATCH] Declarative %generate_buildrequires: Keep the BRs stable Make the rpm-macros implementation add new BuildRequires, but not removing some. This makes the individual rounds of %generate_buildrequires behave more predictably. Nothing says the previous approach is wrong, but is might blow up unexpectedly. --- cmake.spec | 5 ++++- macros.cmake.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 05724ca..0bd47ae 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global patch_version 10 # 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 @@ -600,6 +600,9 @@ popd %changelog +* Fri Dec 12 2025 Miro Hrončok - 3.31.10-3 +- Declarative %%generate_buildrequires: Keep the BRs stable + * Thu Dec 11 2025 Neal Gompa - 3.31.10-2 - macros: Enable support for RPM 4.20+ declarative buildsystem feature diff --git a/macros.cmake.in b/macros.cmake.in index 6c260fd..3eb0ef5 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -58,7 +58,7 @@ # Declarative buildsystem macros (usable with rpm >= 4.20) # https://rpm-software-management.github.io/rpm/manual/buildsystem.html -%cmake_generate_buildrequires(-) echo "cmake" +%cmake_generate_buildrequires(-) echo "cmake-rpm-macros"; echo "cmake" %buildsystem_cmake_generate_buildrequires() %cmake_generate_buildrequires %{*} %buildsystem_cmake_conf() %cmake %{*}