From fcb874ccd5f44f8c0bc5b69be79830bbeee039ac Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 12 Nov 2024 21:41:10 +0300 Subject: [PATCH] import cmake-3.30.5-2.el10 --- .cmake.metadata | 2 +- .gitignore | 2 +- SPECS/cmake.spec | 23 ++++++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.cmake.metadata b/.cmake.metadata index c8aa209..4f2f5a5 100644 --- a/.cmake.metadata +++ b/.cmake.metadata @@ -1 +1 @@ -9512643f226e1ccbf79beb9f4b066da45fe8dff6 SOURCES/cmake-3.28.2.tar.gz +bab4725b65d45b3c86e7f1413b265b2d498b1abf SOURCES/cmake-3.30.5.tar.gz diff --git a/.gitignore b/.gitignore index 779394e..347fc0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cmake-3.28.2.tar.gz +SOURCES/cmake-3.30.5.tar.gz diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec index c0fccc3..afe4da1 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -68,8 +68,8 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 28 -%global patch_version 2 +%global minor_version 30 +%global patch_version 5 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 2 @@ -515,9 +515,12 @@ popd %files doc -# Pickup license-files from main-pkg's license-dir -# If there's no license-dir they are picked up by %%doc previously -%{?_licensedir:%license %{_datadir}/licenses/%{name}*} +%license Copyright.txt* +%license COPYING* +%if %{with bundled_cppdap} +%license LICENSE.cppdap +%license NOTICE.cppdap +%endif %doc %{_pkgdocdir} @@ -549,6 +552,16 @@ popd %changelog +* Tue Nov 05 2024 Tom Stellard - 3.30.5-2 +- Fix conflicting license files in cmake and cmake-doc + +* Tue Oct 29 2024 Tom Stellard - 3.30.5-1 +- Update version to 3.30.5 + +* Tue Oct 29 2024 Troy Dawson - 3.28.2-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + * Fri Oct 25 2024 MSVSphere Packaging Team - 3.28.2-2 - Rebuilt for MSVSphere 10