Toshaan Bharvani
parent
ad41d86998
commit
9b020c6750
|
|
@ -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 -
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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 20
|
||||
%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 7
|
||||
%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}.2
|
||||
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
|
||||
|
|
@ -103,14 +112,6 @@ Patch100: %{name}-findruby.patch
|
|||
%if 0%{?fedora} && 0%{?fedora} < 34
|
||||
Patch101: %{name}-fedora-flag_release.patch
|
||||
%endif
|
||||
# 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.20-CPACK_THREADS.patch
|
||||
# see rhbz#1975096
|
||||
Patch104: cmake-3.20.4-glibc_libdl.patch
|
||||
|
||||
# Patch for renaming on EPEL
|
||||
%if 0%{?name_suffix:1}
|
||||
|
|
@ -140,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)
|
||||
|
|
@ -192,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)
|
||||
|
|
@ -208,6 +214,11 @@ Provides: bundled(md5-deutsch)
|
|||
# https://fedorahosted.org/fpc/ticket/555
|
||||
Provides: bundled(kwsys)
|
||||
|
||||
# The license files are shipped in both the cmake and cmake-doc packages and
|
||||
# can cause conflicts when updating.
|
||||
# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K
|
||||
Conflicts: cmake-doc < %{version}-%{release}
|
||||
|
||||
%description
|
||||
CMake is used to control the software compilation process using simple
|
||||
platform and compiler independent configuration files. CMake generates
|
||||
|
|
@ -221,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}}
|
||||
|
|
@ -239,8 +250,10 @@ This package contains common data-files for %{name}.
|
|||
Summary: Documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
# license files moved from the doc package to main package.
|
||||
Conflicts: %{name} <= 3.20.1
|
||||
# The license files are shipped in both the cmake and cmake-doc packages and
|
||||
# can cause conflicts when updating.
|
||||
# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K
|
||||
Conflicts: %{name} < %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
This package contains documentation for %{name}.
|
||||
|
|
@ -311,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
|
||||
|
|
@ -366,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 .
|
||||
|
|
@ -471,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.*
|
||||
|
|
@ -531,6 +555,27 @@ 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.
|
||||
|
||||
* Thu Oct 26 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-1
|
||||
- Update to version 3.26.5-1
|
||||
|
||||
* Mon Oct 23 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-9
|
||||
- Fix CPack bug with pretrans scriptlet
|
||||
|
||||
* Tue Jan 31 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-8
|
||||
- Fix test case broken by git fix for CVE-2022-39253
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.20.2-7
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
|
|
|||
Loading…
Reference in New Issue