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=87a1114ba4bc...
https://src.fedoraproject.org/cgit/rpms/cmake.git/commit/?id=c99e94ccd344....
Change:
-%ifarch %{ix86}
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 63c436655e4988930d34259d261f1795e2132eda
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Feb 25 10:17:21 2021 -0600
cmake-3.19.6
diff --git a/0572-FindBoost-Add-support-for-Boost-1.75.patch
b/0572-FindBoost-Add-support-for-Boost-1.75.patch
deleted file mode 100644
index 75c0bb5..0000000
--- a/0572-FindBoost-Add-support-for-Boost-1.75.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 82930647607d23b118c84194afc3c70d6d8e79e3 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king(a)kitware.com>
-Date: Wed, 3 Feb 2021 12:07:49 -0500
-Subject: [PATCH 572/590] FindBoost: Add support for Boost 1.75
-
-Update the list of known versions.
-
-Run the command
-
- cmake -DBOOST_DIR=/path/to/boost_1_75_0 \
- -P Utilities/Scripts/BoostScanDeps.cmake
-
-to extract dependencies from the 1.75.0 source tree.
-They differ from 1.74's dependencies by the addition of
-dependencies of the json component, so add a new version
-block to FindBoost.
-
-Fixes: #21773
----
- Modules/FindBoost.cmake | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index 00e4ff1d21..54d9593ca7 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1186,11 +1186,26 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- set(_Boost_TIMER_DEPENDENCIES chrono)
- set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
- set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-+ elseif(Boost_VERSION_STRING VERSION_LESS 1.75.0)
-+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time)
-+ set(_Boost_COROUTINE_DEPENDENCIES context)
-+ set(_Boost_FIBER_DEPENDENCIES context)
-+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
-+ set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono
atomic)
-+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f
math_tr1l atomic)
-+ set(_Boost_MPI_DEPENDENCIES serialization)
-+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi
serialization)
-+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
-+ set(_Boost_THREAD_DEPENDENCIES chrono date_time atomic)
-+ set(_Boost_TIMER_DEPENDENCIES chrono)
-+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
-+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
- else()
- set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time)
- set(_Boost_COROUTINE_DEPENDENCIES context)
- set(_Boost_FIBER_DEPENDENCIES context)
- set(_Boost_IOSTREAMS_DEPENDENCIES regex)
-+ set(_Boost_JSON_DEPENDENCIES container)
- set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono
atomic)
- set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f
math_tr1l atomic)
- set(_Boost_MPI_DEPENDENCIES serialization)
-@@ -1200,7 +1215,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- set(_Boost_TIMER_DEPENDENCIES chrono)
- set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
- set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.75.0)
-+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0)
- message(WARNING "New Boost version may have incorrect or missing
dependencies and imported targets")
- endif()
- endif()
-@@ -1472,7 +1487,7 @@ else()
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of
- # _Boost_COMPONENT_DEPENDENCIES.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-- "1.74.0" "1.74"
-+ "1.75.0" "1.75" "1.74.0" "1.74"
- "1.73.0" "1.73" "1.72.0" "1.72"
"1.71.0" "1.71" "1.70.0" "1.70" "1.69.0"
"1.69"
- "1.68.0" "1.68" "1.67.0" "1.67"
"1.66.0" "1.66" "1.65.1" "1.65.0"
"1.65"
- "1.64.0" "1.64" "1.63.0" "1.63"
"1.62.0" "1.62" "1.61.0" "1.61" "1.60.0"
"1.60"
---
-2.29.2
-
diff --git a/cmake.spec b/cmake.spec
index 0081f7f..8e068d6 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -77,7 +77,7 @@
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
-Version: %{major_version}.%{minor_version}.4
+Version: %{major_version}.%{minor_version}.6
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -112,8 +112,6 @@ Patch102: %{name}-mingw-dl.patch
# memory-hungry tests when building on koji builders with *lots* of cores
# so limit it to some reasonable number (4)
Patch103: cmake-3.19-CPACK_ARCHIVE_THREADS.patch
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1925355
-Patch104: 0572-FindBoost-Add-support-for-Boost-1.75.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
@@ -535,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Thu Feb 25 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.6-2
+- cmake-3.19.6
+
* Sat Feb 06 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.4-2
- CMake warning when searching for Boost 1.75 (#1925355)
diff --git a/sources b/sources
index aacd71b..8a64cd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.19.4.tar.gz) =
e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
+SHA512 (cmake-3.19.6.tar.gz) =
556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
commit 77583d3966d5ab3a2fda49b2b16bf8ed2eafa5bc
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sat Feb 6 22:31:22 2021 -0600
CMake warning when searching for Boost 1.75 (#1925355)
diff --git a/0572-FindBoost-Add-support-for-Boost-1.75.patch
b/0572-FindBoost-Add-support-for-Boost-1.75.patch
new file mode 100644
index 0000000..75c0bb5
--- /dev/null
+++ b/0572-FindBoost-Add-support-for-Boost-1.75.patch
@@ -0,0 +1,74 @@
+From 82930647607d23b118c84194afc3c70d6d8e79e3 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king(a)kitware.com>
+Date: Wed, 3 Feb 2021 12:07:49 -0500
+Subject: [PATCH 572/590] FindBoost: Add support for Boost 1.75
+
+Update the list of known versions.
+
+Run the command
+
+ cmake -DBOOST_DIR=/path/to/boost_1_75_0 \
+ -P Utilities/Scripts/BoostScanDeps.cmake
+
+to extract dependencies from the 1.75.0 source tree.
+They differ from 1.74's dependencies by the addition of
+dependencies of the json component, so add a new version
+block to FindBoost.
+
+Fixes: #21773
+---
+ Modules/FindBoost.cmake | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index 00e4ff1d21..54d9593ca7 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -1186,11 +1186,26 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
+ set(_Boost_TIMER_DEPENDENCIES chrono)
+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
++ elseif(Boost_VERSION_STRING VERSION_LESS 1.75.0)
++ set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time)
++ set(_Boost_COROUTINE_DEPENDENCIES context)
++ set(_Boost_FIBER_DEPENDENCIES context)
++ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
++ set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono
atomic)
++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f
math_tr1l atomic)
++ set(_Boost_MPI_DEPENDENCIES serialization)
++ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi
serialization)
++ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
++ set(_Boost_THREAD_DEPENDENCIES chrono date_time atomic)
++ set(_Boost_TIMER_DEPENDENCIES chrono)
++ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+ else()
+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time)
+ set(_Boost_COROUTINE_DEPENDENCIES context)
+ set(_Boost_FIBER_DEPENDENCIES context)
+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
++ set(_Boost_JSON_DEPENDENCIES container)
+ set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono
atomic)
+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f
math_tr1l atomic)
+ set(_Boost_MPI_DEPENDENCIES serialization)
+@@ -1200,7 +1215,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
+ set(_Boost_TIMER_DEPENDENCIES chrono)
+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time
atomic)
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.75.0)
++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0)
+ message(WARNING "New Boost version may have incorrect or missing
dependencies and imported targets")
+ endif()
+ endif()
+@@ -1472,7 +1487,7 @@ else()
+ # _Boost_COMPONENT_HEADERS. See the instructions at the top of
+ # _Boost_COMPONENT_DEPENDENCIES.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+- "1.74.0" "1.74"
++ "1.75.0" "1.75" "1.74.0" "1.74"
+ "1.73.0" "1.73" "1.72.0" "1.72"
"1.71.0" "1.71" "1.70.0" "1.70" "1.69.0"
"1.69"
+ "1.68.0" "1.68" "1.67.0" "1.67"
"1.66.0" "1.66" "1.65.1" "1.65.0"
"1.65"
+ "1.64.0" "1.64" "1.63.0" "1.63"
"1.62.0" "1.62" "1.61.0" "1.61" "1.60.0"
"1.60"
+--
+2.29.2
+
diff --git a/cmake.spec b/cmake.spec
index 5e65873..0081f7f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -70,7 +70,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 1
+%global baserelease 2
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -109,6 +109,11 @@ Patch101: %{name}-fedora-flag_release.patch
# Add dl to CMAKE_DL_LIBS on MINGW
#
https://gitlab.kitware.com/cmake/cmake/issues/17600
Patch102: %{name}-mingw-dl.patch
+# memory-hungry tests when building on koji builders with *lots* of cores
+# so limit it to some reasonable number (4)
+Patch103: cmake-3.19-CPACK_ARCHIVE_THREADS.patch
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1925355
+Patch104: 0572-FindBoost-Add-support-for-Boost-1.75.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
@@ -117,9 +122,6 @@ Patch1: %{name}-rename.patch
Patch2: %{name}-libarchive3.patch
%endif
%endif
-# memory-hungry tests when building on koji builders with *lots* of cores
-# so limit it to some reasonable number (4)
-Patch3: cmake-3.19-CPACK_ARCHIVE_THREADS.patch
BuildRequires: coreutils
BuildRequires: findutils
@@ -533,6 +535,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Sat Feb 06 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.4-2
+- CMake warning when searching for Boost 1.75 (#1925355)
+
* Thu Jan 28 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.4-1
- cmake-3.19.4
commit 90c00fbf34a2660084eeef3a367f3ee7c0a2d96e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Jan 28 15:43:16 2021 -0600
cmake-3.19.4
diff --git a/cmake.spec b/cmake.spec
index 7a2d361..5e65873 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -70,14 +70,14 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 2
+%global baserelease 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}.3
+Version: %{major_version}.%{minor_version}.4
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Thu Jan 28 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.4-1
+- cmake-3.19.4
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.19.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 6ea7749..aacd71b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.19.3.tar.gz) =
54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
+SHA512 (cmake-3.19.4.tar.gz) =
e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
commit 27354e45c105377a6a84bd6ed9b6746bf3bff5f4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 02:10:45 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/cmake.spec b/cmake.spec
index 27d0905..7a2d361 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -70,7 +70,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 1
+%global baserelease 2
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.19.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Wed Jan 13 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.3-1
- cmake-3.19.3
commit 3284292dcd8a97c088f2d5105d0bdd6dce10d6a0
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jan 13 09:30:49 2021 -0600
cmake-3.19.3
diff --git a/cmake.spec b/cmake.spec
index 8901405..27d0905 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -77,7 +77,7 @@
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
-Version: %{major_version}.%{minor_version}.2
+Version: %{major_version}.%{minor_version}.3
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Wed Jan 13 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 3.19.3-1
+- cmake-3.19.3
+
* Mon Jan 11 2021 Cristian Morales Vega <christian.morales.vega(a)gmail.com> -
3.19.2-1
- Update to 3.19.2
diff --git a/sources b/sources
index cefa33b..6ea7749 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.19.2.tar.gz) =
d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
+SHA512 (cmake-3.19.3.tar.gz) =
54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
commit 87a1114ba4bc4ae5c843fbb85fe5c0fe844b7af0
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 12 16:50:36 2021 -0600
memory-hungry tests when building on koji builders with *lots* of cores
... so limit it to some reasonable number (4)
diff --git a/cmake-3.19-CPACK_ARCHIVE_THREADS.patch
b/cmake-3.19-CPACK_ARCHIVE_THREADS.patch
new file mode 100644
index 0000000..bdf99a3
--- /dev/null
+++ b/cmake-3.19-CPACK_ARCHIVE_THREADS.patch
@@ -0,0 +1,11 @@
+diff -up
cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS
cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake
+---
cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS 2020-12-16
06:35:29.000000000 -0600
++++ cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-01-12
16:47:40.139581556 -0600
+@@ -1,6 +1,6 @@
+ install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
+
+-set(CPACK_ARCHIVE_THREADS 0)
++set(CPACK_ARCHIVE_THREADS 4)
+
+ if(PACKAGING_TYPE STREQUAL "COMPONENT")
+ set(CPACK_COMPONENTS_ALL test)
diff --git a/cmake.spec b/cmake.spec
index ef806c1..8901405 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -117,6 +117,9 @@ Patch1: %{name}-rename.patch
Patch2: %{name}-libarchive3.patch
%endif
%endif
+# memory-hungry tests when building on koji builders with *lots* of cores
+# so limit it to some reasonable number (4)
+Patch3: cmake-3.19-CPACK_ARCHIVE_THREADS.patch
BuildRequires: coreutils
BuildRequires: findutils
@@ -456,15 +459,9 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
%if %{with bootstrap}
NO_TEST="$NO_TEST|curl"
%endif
-%ifarch %{ix86}
-# one test (sometimes?) runs out of memory, so limit parallelism as a workaround --
rdieter
-%global smp_mflags -j2
-%else
-%global smp_mflags %{?smp_mflags}
-%endif
-bin/ctest%{?name_suffix} %{?smp_mflags} -V -E "$NO_TEST" --output-on-failure
+bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
# Keep an eye on failing tests
-bin/ctest%{?name_suffix} %{?smp_mflags} -V -R "$NO_TEST" --output-on-failure ||
:
+bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure
|| :
popd
%if 0%{?rhel} && 0%{?rhel} <= 6
mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
commit c99e94ccd34451c2b6e6fdd72033014ba56deedc
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 12 12:24:48 2021 -0600
one test (sometimes?) runs out of memory on i686, so limit parallelism as a
workaround
diff --git a/cmake.spec b/cmake.spec
index fb9853f..ef806c1 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -456,9 +456,15 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
%if %{with bootstrap}
NO_TEST="$NO_TEST|curl"
%endif
-bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
+%ifarch %{ix86}
+# one test (sometimes?) runs out of memory, so limit parallelism as a workaround --
rdieter
+%global smp_mflags -j2
+%else
+%global smp_mflags %{?smp_mflags}
+%endif
+bin/ctest%{?name_suffix} %{?smp_mflags} -V -E "$NO_TEST" --output-on-failure
# Keep an eye on failing tests
-bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure
|| :
+bin/ctest%{?name_suffix} %{?smp_mflags} -V -R "$NO_TEST" --output-on-failure ||
:
popd
%if 0%{?rhel} && 0%{?rhel} <= 6
mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
commit a6595cacfa1375c00af94eda15b2bfd37dff7bed
Author: Cristian Morales Vega <cristian(a)samknows.com>
Date: Mon Jan 11 17:27:28 2021 +0000
Update to 3.19.2
diff --git a/5383.patch b/5383.patch
deleted file mode 100644
index c864386..0000000
--- a/5383.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001
-From: Marc Chevrier <marc.chevrier(a)gmail.com>
-Date: Fri, 16 Oct 2020 11:36:53 +0200
-Subject: [PATCH] FindPython: Add support of version 3.10
-
----
- Modules/FindPython/Support.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
-index 7de2d29946..2b911ae7e3 100644
---- a/Modules/FindPython/Support.cmake
-+++ b/Modules/FindPython/Support.cmake
-@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
- message (FATAL_ERROR "FindPython: INTERNAL ERROR")
- endif()
- if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
-- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
- elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
- set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- else()
---
-GitLab
-
diff --git a/5482.patch b/5482.patch
deleted file mode 100644
index c259de7..0000000
--- a/5482.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
-Date: Mon, 9 Nov 2020 17:35:13 +0100
-Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10
-
-Extend the change from commit 23cd98a66a (FindPython: Add support of
-version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
-`FindPython{Interp,Libs}` modules too.
----
- Modules/FindPythonInterp.cmake | 2 +-
- Modules/FindPythonLibs.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 1e01a99cbe..efe0f11901 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -54,7 +54,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index d3ec7beec6..396f0d2ed4 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
---
-GitLab
-
diff --git a/cmake-3.18.3-findblas.patch b/cmake-3.18.3-findblas.patch
deleted file mode 100644
index 94ab505..0000000
--- a/cmake-3.18.3-findblas.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake
---- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200
-+++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200
-@@ -27,6 +27,7 @@
- possibilities. List of vendors valid in this module:
-
- * ``Goto``
-+ * ``FlexiBLAS``
- * ``OpenBLAS``
- * ``FLAME``
- * ``ATLAS PhiPACK``
-@@ -538,6 +539,22 @@
- ""
- ""
- ""
-+ )
-+ endif()
-+endif()
-+
-+# FlexiBLAS? (
http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
-+if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
-+ if(NOT BLAS_LIBRARIES)
-+ check_blas_libraries(
-+ BLAS_LIBRARIES
-+ BLAS
-+ sgemm
-+ ""
-+ "flexiblas"
-+ ""
-+ ""
-+ ""
- )
- endif()
- endif()
-diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake
cmake-3.18.2/Modules/FindLAPACK.cmake
---- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200
-+++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200
-@@ -26,6 +26,7 @@
- If set, checks only the specified vendor, if not set checks all the
- possibilities. List of vendors valid in this module:
-
-+ * ``FlexiBLAS``
- * ``OpenBLAS``
- * ``FLAME``
- * ``Intel10_32`` (intel mkl v10 32 bit)
-@@ -349,6 +350,23 @@
- ""
- ""
- ""
-+ "${BLAS_LIBRARIES}"
-+ )
-+ endif()
-+ endif()
-+
-+ # FlexiBLAS? (
http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
-+ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
-+ if(NOT LAPACK_LIBRARIES)
-+ check_lapack_libraries(
-+ LAPACK_LIBRARIES
-+ LAPACK
-+ cheev
-+ ""
-+ "flexiblas"
-+ ""
-+ ""
-+ ""
- "${BLAS_LIBRARIES}"
- )
- endif()
diff --git a/cmake.spec b/cmake.spec
index dd75790..fb9853f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -63,21 +63,21 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3
-%global minor_version 18
+%global minor_version 19
# Set to RC version if building RC, else %%{nil}
#global rcsuf rc1
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 4
+%global baserelease 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}.4
+Version: %{major_version}.%{minor_version}.2
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@@ -109,11 +109,6 @@ Patch101: %{name}-fedora-flag_release.patch
# Add dl to CMAKE_DL_LIBS on MINGW
#
https://gitlab.kitware.com/cmake/cmake/issues/17600
Patch102: %{name}-mingw-dl.patch
-# rhbz#1871346
-Patch103: %{name}-3.18.3-findblas.patch
-# Add Python 3.10 to the hadcoded lists of Python versions
-Patch104:
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5383.patch
-Patch105:
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5482.patch
# Patch for renaming on EPEL
%if 0%{?name_suffix:1}
@@ -535,6 +530,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Mon Jan 11 2021 Cristian Morales Vega <christian.morales.vega(a)gmail.com> -
3.19.2-1
+- Update to 3.19.2
+
* Tue Dec 15 2020 Tom Stellard <tstellar(a)redhat.com> - 3.18.4-4
- Update BuildRequires for eln
diff --git a/sources b/sources
index 513aff4..cefa33b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmake-3.18.4.tar.gz) =
2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
+SHA512 (cmake-3.19.2.tar.gz) =
d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
commit a3fc67c060ebaf01ebfb240b5e2639175b394cfc
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Sat Dec 19 05:14:27 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/cmake.spec b/cmake.spec
index 8792f03..dd75790 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -193,6 +193,7 @@ BuildRequires: desktop-file-utils
# Ensure we have our own rpm-macros in place during build.
BuildRequires: %{name}-rpm-macros
%endif
+BuildRequires: make
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-rpm-macros = %{version}-%{release}
commit 61280587ecfcbcd9ab62a0bba9f35cfdb74e78ca
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Mon Nov 9 22:08:07 2020 +0000
Update BuildRequires for eln
jsoncpp and rhash are going to be removed from eln.
diff --git a/cmake.spec b/cmake.spec
index cb2c87d..8792f03 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -39,6 +39,14 @@
%bcond_without sphinx
%endif
+%if !0%{?rhel}
+%bcond_with bundled_jsoncpp
+%bcond_with bundled_rhash
+%else
+%bcond_without bundled_jsoncpp
+%bcond_without bundled_rhash
+%endif
+
# Run tests
%bcond_without test
@@ -62,7 +70,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
-%global baserelease 3
+%global baserelease 4
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@@ -139,14 +147,22 @@ BuildRequires: %{_bindir}/sphinx-build
BuildRequires: bzip2-devel
BuildRequires: curl-devel
BuildRequires: expat-devel
+%if %{with bundled_jsoncpp}
+Provides: bundled(jsoncpp)
+%else
BuildRequires: jsoncpp-devel
+%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libarchive-devel
%else
BuildRequires: libarchive3-devel
%endif
BuildRequires: libuv-devel
+%if %{with bundled_rhash}
+Provides: bundled(rhash)
+%else
BuildRequires: rhash-devel
+%endif
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: vim-filesystem
@@ -295,6 +311,12 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
--docdir=/share/doc/%{name} --mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+%if %{with bundled_rhash}
+ --no-system-librhash \
+%endif
+%if %{with bundled_jsoncpp}
+ --no-system-jsoncpp \
+%endif
%if %{with sphinx}
--sphinx-man --sphinx-html \
%else
@@ -512,6 +534,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog
+* Tue Dec 15 2020 Tom Stellard <tstellar(a)redhat.com> - 3.18.4-4
+- Update BuildRequires for eln
+
* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13(a)gmail.com> - 3.18.4-3
- Ensure CMake does not strip binaries with package builds