The package rpms/cmake.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=b02a9d979e65....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit dbe4a674efd94277d26b27a8f0c591d0e50d69d7
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 16 22:03:14 2022 +0100
cmake-3.25.0
Fixes rhbz#2143345
diff --git a/cmake.spec b/cmake.spec
index 404b1fb..9daab9c 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,12 +63,12 @@
%global major_version 3
%global minor_version 25
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc4
+#global rcsuf rc1
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.6
+%global baserelease 1
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -525,6 +525,10 @@ popd
%changelog
+* Wed Nov 16 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-1
+- cmake-3.25.0
+ Fixes rhbz#2143345
+
* Wed Nov 09 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.6.rc4
- cmake-3.25.0-rc4
Fixes rhbz#2141122
diff --git a/sources b/sources
index 76b072e..f335010 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.25.0-rc4.tar.gz) =
d2ecec5e35ebd184d685848ce14770d71ef6836993d73cd8156c6276c82cb51a54e5dd9ba7eee592ea22d05df4dd5c83c311e72963e5fc27eb972fa9b63a51a9
+SHA512 (cmake-3.25.0.tar.gz) =
f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c
commit 098fd9fa1553d39eb19836640da2c6a60e08a45b
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 9 08:07:16 2022 +0100
cmake-3.25.0-rc4
Fixes rhbz#2141122
diff --git a/cmake.spec b/cmake.spec
index 38c2080..404b1fb 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,12 +63,12 @@
%global major_version 3
%global minor_version 25
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc3
+%global rcsuf rc4
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.5
+%global baserelease 0.6
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -525,6 +525,10 @@ popd
%changelog
+* Wed Nov 09 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.6.rc4
+- cmake-3.25.0-rc4
+ Fixes rhbz#2141122
+
* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.5.rc3
- Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator,
CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject
diff --git a/sources b/sources
index 5dd005c..76b072e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.25.0-rc3.tar.gz) =
f0a99cf5f52d0dff64000ec2553126830e31d3a5b8015285f48f362d8e2ec40cc99b7cea1518c04644b3f5728b674dc64642859b73b5f2e2b85f05f15cf4e56d
+SHA512 (cmake-3.25.0-rc4.tar.gz) =
d2ecec5e35ebd184d685848ce14770d71ef6836993d73cd8156c6276c82cb51a54e5dd9ba7eee592ea22d05df4dd5c83c311e72963e5fc27eb972fa9b63a51a9
commit b02a9d979e6524080710405e995d07d4fe8f457d
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 2 09:36:12 2022 +0100
Re-enable kwsys.testProcess-{4,5} on s390x
diff --git a/cmake.spec b/cmake.spec
index 752d34c..38c2080 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -449,10 +449,6 @@ pushd %{_vpath_builddir}
NO_TEST="CTestTestUpload"
# Likely failing for hardening flags from system.
NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode"
-# kwsys.testProcess-{4,5} are flaky on s390x.
-%ifarch s390x
-NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
-%endif
# curl test may fail during bootstrap
%if %{with bootstrap}
NO_TEST="$NO_TEST|curl"
@@ -533,6 +529,7 @@ popd
- Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator,
CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject
during testsuite run
+- Re-enable kwsys.testProcess-{4,5} on s390x
* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.4.rc3
- cmake-3.25.0-rc3
commit e609e81f2792409797bb0592fad302a8ad8787ae
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 2 09:34:44 2022 +0100
Re-enable some more tests that are passing now
diff --git a/cmake.spec b/cmake.spec
index 4dee600..752d34c 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -445,12 +445,10 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
%if %{with test}
%check
pushd %{_vpath_builddir}
-# CTestTestUpload and BundleUtilities require internet access
-# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 -
https://gitlab.kitware.com/cmake/cmake/issues/19983
-NO_TEST="CTestTestUpload|BundleUtilities"
-# Likely failing for GCC 12
-NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator"
-NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode"
+# CTestTestUpload requires internet access.
+NO_TEST="CTestTestUpload"
+# Likely failing for hardening flags from system.
+NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode"
# kwsys.testProcess-{4,5} are flaky on s390x.
%ifarch s390x
NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
@@ -460,7 +458,7 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
NO_TEST="$NO_TEST|curl"
%endif
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
-## do this only periodically, not for every build -- rdieter 20210429
+## do this only periodically, not for every build -- besser82 20221102
# Keep an eye on failing tests
#bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure
|| :
popd
@@ -532,7 +530,9 @@ popd
%changelog
* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.5.rc3
-- Re-enable ExternalProject and CTest.UpdateGIT on testsuite run
+- Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator,
+ CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject
+ during testsuite run
* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.4.rc3
- cmake-3.25.0-rc3
commit aa5cce21c6fbdacbad31afc90c3d42b9b3f3af66
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 2 08:19:42 2022 +0100
Re-enable ExternalProject and CTest.UpdateGIT on testsuite run
This reverts commit 7df9be99dc7f57cae228fe8e00a9320f91c0f4e7.
diff --git a/cmake.spec b/cmake.spec
index b1ea0b6..4dee600 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.4
+%global baserelease 0.5
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -445,9 +445,9 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
%if %{with test}
%check
pushd %{_vpath_builddir}
-# CTestTestUpload, BundleUtilities, ExternalProject, and CTest.UpdateGIT require internet
access
+# CTestTestUpload and BundleUtilities require internet access
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 -
https://gitlab.kitware.com/cmake/cmake/issues/19983
-NO_TEST="CTestTestUpload|BundleUtilities|ExternalProject|CTest.UpdateGIT"
+NO_TEST="CTestTestUpload|BundleUtilities"
# Likely failing for GCC 12
NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator"
NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode"
@@ -531,6 +531,9 @@ popd
%changelog
+* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.5.rc3
+- Re-enable ExternalProject and CTest.UpdateGIT on testsuite run
+
* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.4.rc3
- cmake-3.25.0-rc3
Fixes rhbz#2062783
commit c0e29fc6cb49bc7716d1ecfb2fa8bab97221d846
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Wed Nov 2 07:54:11 2022 +0100
cmake-3.25.0-rc3
Fixes rhbz#2062783
diff --git a/cmake.spec b/cmake.spec
index 750255a..b1ea0b6 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,12 +63,12 @@
%global major_version 3
%global minor_version 25
# Set to RC version if building RC, else %%{nil}
-%global rcsuf rc2
+%global rcsuf rc3
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.3
+%global baserelease 0.4
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -531,6 +531,10 @@ popd
%changelog
+* Wed Nov 02 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.4.rc3
+- cmake-3.25.0-rc3
+ Fixes rhbz#2062783
+
* Sun Oct 30 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.3.rc2
- Allow valid short arguments for %%ctest macro
Fixes rhbz#2127650
diff --git a/sources b/sources
index 3e604b9..5dd005c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.25.0-rc2.tar.gz) =
74d2f67d0653b0ca658b8b10556e575421f36ab10d4a233b6602a482871478af7322171df4a989b1393872e24edccc18e658ac31d78372ff2ef8da7ac6664dd4
+SHA512 (cmake-3.25.0-rc3.tar.gz) =
f0a99cf5f52d0dff64000ec2553126830e31d3a5b8015285f48f362d8e2ec40cc99b7cea1518c04644b3f5728b674dc64642859b73b5f2e2b85f05f15cf4e56d
commit 198fb99c989b7ff62ce3320610989143fba65b76
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sun Oct 30 13:56:05 2022 +0100
Allow valid short arguments for %%ctest macro
Fixes rhbz#2127650
diff --git a/cmake.spec b/cmake.spec
index e5cdf9a..750255a 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.2
+%global baserelease 0.3
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -531,6 +531,10 @@ popd
%changelog
+* Sun Oct 30 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.3.rc2
+- Allow valid short arguments for %%ctest macro
+ Fixes rhbz#2127650
+
* Sun Oct 30 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.2.rc2
- Drop non-upstream CMAKE_DL_LIBS windows patch
Fixes rhbz#2127529
diff --git a/macros.cmake b/macros.cmake
index 54598ee..257f0bd 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -50,7 +50,7 @@
%cmake_install \
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
-%ctest(:-:) \
+%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
cd "%{__cmake_builddir}" \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
cd -
@@ -59,4 +59,5 @@
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
-%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
+%ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
+ %ctest %{**}
commit 59c57b9caae3ceca514772cd3145c25ec8532093
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sun Oct 30 13:09:50 2022 +0100
Drop non-upstream CMAKE_DL_LIBS windows patch
Fixes rhbz#2127529
diff --git a/cmake.spec b/cmake.spec
index 60bc5c3..e5cdf9a 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 0.1
+%global baserelease 0.2
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -108,7 +108,9 @@ Patch101: %{name}-fedora-flag_release.patch
%endif
# Add dl to CMAKE_DL_LIBS on MINGW
#
https://gitlab.kitware.com/cmake/cmake/issues/17600
+%if 0%{?fedora} && 0%{?fedora} < 38
Patch102: %{name}-mingw-dl.patch
+%endif
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
@@ -529,6 +531,10 @@ popd
%changelog
+* Sun Oct 30 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.2.rc2
+- Drop non-upstream CMAKE_DL_LIBS windows patch
+ Fixes rhbz#2127529
+
* Sat Oct 29 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.1.rc2
- cmake-3.25.0-rc2
Fixes rhbz#2062783
commit a538e8d057944c9ac1792e18dfd351f3c08ef2b5
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sat Oct 29 12:03:59 2022 +0200
cmake-3.25.0-rc2
Fixes rhbz#2062783
diff --git a/cmake.spec b/cmake.spec
index a8518e5..60bc5c3 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -61,21 +61,21 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3
-%global minor_version 24
+%global minor_version 25
# Set to RC version if building RC, else %%{nil}
-#global rcsuf %%{nil}
+%global rcsuf rc2
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 1
+%global baserelease 0.1
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
-Version: %{major_version}.%{minor_version}.2
+Version: %{major_version}.%{minor_version}.0
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -529,6 +529,10 @@ popd
%changelog
+* Sat Oct 29 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.25.0-0.1.rc2
+- cmake-3.25.0-rc2
+ Fixes rhbz#2062783
+
* Sat Oct 29 2022 Björn Esser <besser82(a)fedoraproject.org> - 3.24.2-1
- cmake-3.24.2
diff --git a/sources b/sources
index 650f1f0..3e604b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.24.2.tar.gz) =
6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
+SHA512 (cmake-3.25.0-rc2.tar.gz) =
74d2f67d0653b0ca658b8b10556e575421f36ab10d4a233b6602a482871478af7322171df4a989b1393872e24edccc18e658ac31d78372ff2ef8da7ac6664dd4