import CS cmake-3.31.8-3.el9

This commit is contained in:
AlmaLinux RelEng Bot 2026-03-30 10:19:29 -04:00
parent b52afc6d02
commit 34fe89c1bd
4 changed files with 44 additions and 9 deletions

View File

@ -1 +1 @@
76bca3fc4614d72e32768d9cd6a88967c694ab5d SOURCES/cmake-3.26.5.tar.gz
40ca517e103a0b22c337bc15a5fbe615c08ad148 SOURCES/cmake-3.31.8.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/cmake-3.26.5.tar.gz
SOURCES/cmake-3.31.8.tar.gz

View File

@ -52,7 +52,8 @@
%ctest(:-:) \
cd "%{__cmake_builddir}" \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \\\
%{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} \
cd -

View File

@ -42,12 +42,21 @@
%bcond_without bundled_rhash
%endif
# cppdap is currently shipped as a static lib from upstream,
# so we do not have it in the repos.
%bcond_without bundled_cppdap
# Run tests
%bcond_without test
# Enable X11 tests
%bcond_without X11_test
# Disable LTO on i686 due to https://issues.redhat.com/browse/RHEL-110451
%ifarch %{ix86}
%global _lto_cflags %{nil}
%endif
# Place rpm-macros into proper location
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -58,21 +67,21 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3
%global minor_version 26
%global minor_version 31
# 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 2
%global baserelease 3
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
%global orig_name cmake
Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.5
Version: %{major_version}.%{minor_version}.8
Release: %{baserelease}%{?relsuf}%{?dist}
Summary: Cross-platform make system
@ -81,7 +90,7 @@ Summary: Cross-platform make system
# Source/kwsys/MD5.c is zlib
# some GPL-licensed bison-generated files, which all include an
# exception granting redistribution under terms of your choice
License: BSD and MIT and zlib
License: BSD-3-Clause AND MIT-open-group AND Zlib%{?with_bundled_cppdap: AND Apache-2.0}
URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{version}%{?versuf}.tar.gz
Source1: %{name}-init.el
@ -132,6 +141,11 @@ BuildRequires: %{_bindir}/sphinx-build
%if %{without bootstrap}
BuildRequires: bzip2-devel
BuildRequires: curl-devel
%if %{with bundled_cppdap}
Provides: bundled(cppdap)
%else
BuildRequires: cppdap-devel
%endif
BuildRequires: expat-devel
%if %{with bundled_jsoncpp}
Provides: bundled(jsoncpp)
@ -184,7 +198,7 @@ BuildRequires: %{name}-rpm-macros
BuildRequires: make
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-rpm-macros = %{version}-%{release}
Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build)
Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
# Explicitly require make. (rhbz#1862014)
@ -218,7 +232,7 @@ generation, code generation, and template instantiation.
Summary: Common data-files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-rpm-macros = %{version}-%{release}
Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build)
%if %{with emacs}
%if 0%{?fedora} || 0%{?rhel} >= 7
Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}}
@ -310,6 +324,9 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
--docdir=/share/doc/%{name} --mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \
--parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \
%if %{with bundled_cppdap}
--no-system-cppdap \
%endif
%if %{with bundled_rhash}
--no-system-librhash \
%endif
@ -365,6 +382,10 @@ do
dname=$(basename $dir)
cp -p $f ./${fname}_${dname}
done
%if %{with bundled_cppdap}
cp -p Utilities/cmcppdap/LICENSE LICENSE.cppdap
cp -p Utilities/cmcppdap/NOTICE NOTICE.cppdap
%endif
# Cleanup pre-installed documentation
%if %{with sphinx}
mv %{buildroot}%{_docdir}/%{name}/html .
@ -470,6 +491,10 @@ popd
%doc %dir %{_pkgdocdir}
%license Copyright.txt*
%license COPYING*
%if %{with bundled_cppdap}
%license LICENSE.cppdap
%license NOTICE.cppdap
%endif
%if %{with sphinx}
%{_mandir}/man1/c%{name}.1.*
%{_mandir}/man1/%{name}.1.*
@ -530,6 +555,15 @@ popd
%changelog
* Tue Dec 02 2025 Tom Stellard <tstellar@redhat.com> - 3.31.8-4
- Make clang-rpm-macros requires conditional on rpm-build
* Fri Nov 28 2025 Tom Stellard <tstellar@redhat.com> - 3.31.8-2
- macros: Fix missing asterisk in ctest macro
* Sat Sep 06 2025 Tom Stellard <tstellar@redhat.com> - 3.31.8-1
- cmake-3.31.8
* Fri Nov 03 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-2
- Fix conflict with license files.