rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

cmake-3.31.8

Browse Source 
Squashed the following commits:

commit ff2fb1a0c82c9e513b197ad150b5ef98db95e860
Author: Tom Stellard <tstellar@redhat.com>
Date:   Sat Sep 2 09:48:47 2023 +0000

    Convert license to SPDX

commit 316590b95f4e12dc274371e47dc7dd0a684d9f9b
Author: Björn Esser <besser82@fedoraproject.org>
Date:   Thu Jun 8 21:34:35 2023 +0200

    Add licensing information for cppdap to packaged files if needed

commit 2dc656c27b7f7d99b13472764bfacab9eb55a0b4
Author: Björn Esser <besser82@fedoraproject.org>
Date:   Thu Jun 8 20:51:55 2023 +0200

    Use CMake-provided cppdap

    It is currently shipped as a static lib from the upstream developers,
    and for that reason we do not have it in the repos.

commit 37488cd73f
Author: Björn Esser <besser82@fedoraproject.org>
Date:   Thu Jun 8 22:07:58 2023 +0200

    Fix copy-rename of cppdap license files

Resolves: RHEL-110451
Resolves: RHEL-112817
This commit is contained in:
Tom Stellard 2023-06-08 20:51:55 +02:00
parent 1f55433556
commit b1a615b77b
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cmake.spec
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 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}.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)
@ -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,9 @@ popd
%changelog
* 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.

2
sources
View File

@ -1 +1 @@
SHA512 (cmake-3.26.5.tar.gz) = 43c17e00d6f326b96ea47c62bbffd19409281641b297b2362e4ed6a696e7e618d2ff265a213634bfa4c1200c3f581531fde6507f282a9460ab65af6c7bab61de
SHA512 (cmake-3.31.8.tar.gz) = 07dbb5af1d449760ef92a921e43c0a0a091989ac51ce3f8b7607bf617b8b56e47c675486d3c620c04f1105b7dfa3852b926915e0888ff46ea473cd01e572f461