Disable bootstrap build

Rebuild (jsoncpp)
tests/cmake-testsuite-sanity: Adapt for new builddir layout
2025-02-27 21:56:22 +01:00 · 2025-02-27 21:53:37 +01:00 · 2025-02-27 21:52:15 +01:00
2 changed files with 7 additions and 3 deletions
--- a/cmake.spec
+++ b/cmake.spec
@ -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 <besser82@fedoraproject.org> - 3.31.6-2
+- Rebuild (jsoncpp)
+
 * Mon Feb 24 2025 Björn Esser <besser82@fedoraproject.org> - 3.31.6-1
 - cmake-3.31.6
  Fixes rhbz#2347346
--- 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"
Author	SHA1	Message	Date
Björn Esser	ec2c611bca	Disable bootstrap build	2025-02-27 21:56:22 +01:00
Björn Esser	e7f929cfcb	Rebuild (jsoncpp)	2025-02-27 21:53:37 +01:00
Björn Esser	32444e33b8	tests/cmake-testsuite-sanity: Adapt for new builddir layout	2025-02-27 21:52:15 +01:00