From 32444e33b832b139efae8a66b29b65cda31bc165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Feb 2025 23:36:55 +0100 Subject: [PATCH 1/3] tests/cmake-testsuite-sanity: Adapt for new builddir layout --- tests/cmake-testsuite-sanity/runtest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 5853dbf..71b061c 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -57,8 +57,9 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" - rlRun "cd $TmpDir/BUILD/$CMakeDir" + rlRun "BuildDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(_rc[0-9]+)?-build$' | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD/$BuildDir | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" + rlRun "cd $TmpDir/BUILD/$BuildDir/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -fs /usr/bin/cmake bin/cmake" From e7f929cfcba5f1d56c8f27fc3d605a50d2f50378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 21:53:37 +0100 Subject: [PATCH 2/3] Rebuild (jsoncpp) --- cmake.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 487d4c4..13dceef 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs @@ -35,7 +35,7 @@ %bcond_without sphinx %if !0%{?rhel} -%bcond_with bundled_jsoncpp +%bcond_without bundled_jsoncpp %bcond_with bundled_rhash %else %bcond_without bundled_jsoncpp @@ -72,7 +72,7 @@ %global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -588,6 +588,9 @@ popd %changelog +* Thu Feb 27 2025 Björn Esser - 3.31.6-2 +- Rebuild (jsoncpp) + * Mon Feb 24 2025 Björn Esser - 3.31.6-1 - cmake-3.31.6 Fixes rhbz#2347346 From ec2c611bca28b0106f4d84fc3506bcaac746e1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 21:55:34 +0100 Subject: [PATCH 3/3] Disable bootstrap build --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 13dceef..ec4fc63 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs @@ -35,7 +35,7 @@ %bcond_without sphinx %if !0%{?rhel} -%bcond_without bundled_jsoncpp +%bcond_with bundled_jsoncpp %bcond_with bundled_rhash %else %bcond_without bundled_jsoncpp