Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

19 changed files with 851 additions and 120 deletions

View File

@ -1 +0,0 @@
76bca3fc4614d72e32768d9cd6a88967c694ab5d SOURCES/cmake-3.26.5.tar.gz

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

2
.gitignore vendored
View File

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

View File

@ -1,7 +1,8 @@
diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRuby.cmake Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake
--- cmake-3.18.2.orig/Modules/FindRuby.cmake 2020-09-08 13:30:51.129086854 +0000 ===================================================================
+++ cmake-3.18.2/Modules/FindRuby.cmake 2020-09-10 07:10:56.679302608 +0000 --- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake
@@ -300,14 +300,8 @@ +++ cmake-3.23.0-rc2/Modules/FindRuby.cmake
@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
_RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
@ -13,8 +14,9 @@ diff -Naur cmake-3.18.2.orig/Modules/FindRuby.cmake cmake-3.18.2/Modules/FindRub
- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
- endif() - endif()
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) + # vendor_ruby
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
# save the results in the cache so we don't have to run ruby the next time again # save the results in the cache so we don't have to run ruby the next time again
set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)

View File

@ -16,7 +16,7 @@
# Run git tests # Run git tests
%bcond_without git_test %bcond_without git_test
# Set to bcond_with or use --without gui to disable qt4 gui build # Set to bcond_with or use --without gui to disable qt gui build
%bcond_without gui %bcond_without gui
# Use ncurses for colorful output # Use ncurses for colorful output
@ -42,12 +42,22 @@
%bcond_without bundled_rhash %bcond_without bundled_rhash
%endif %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 # Run tests
%bcond_without test %bcond_without test
# Enable X11 tests # Enable X11 tests
%bcond_without X11_test %bcond_without X11_test
# Do not build non-lto objects to reduce build time significantly.
%global build_cflags %(echo '%{build_cflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_cxxflags %(echo '%{build_cxxflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_fflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_fcflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
# Place rpm-macros into proper location # Place rpm-macros into proper location
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -58,22 +68,30 @@
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
%global major_version 3 %global major_version 3
%global minor_version 26 %global minor_version 30
# Set to RC version if building RC, else %%{nil} %global patch_version 5
#global rcsuf rc1
%{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild # For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 2 %global baserelease 2
# Set to RC version if building RC, else comment out.
#%%global rcsuf rc3
%if 0%{?rcsuf:1}
%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf}
%global tar_version %{major_version}.%{minor_version}.%{patch_version}-%{rcsuf}
%else
%global pkg_version %{major_version}.%{minor_version}.%{patch_version}
%global tar_version %{major_version}.%{minor_version}.%{patch_version}
%endif
# Uncomment if building for EPEL # Uncomment if building for EPEL
#global name_suffix %%{major_version} #global name_suffix %%{major_version}
%global orig_name cmake %global orig_name cmake
Name: %{orig_name}%{?name_suffix} Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.5 Version: %{pkg_version}
Release: %{baserelease}%{?relsuf}%{?dist} Release: %{baserelease}%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
# most sources are BSD # most sources are BSD
@ -81,11 +99,11 @@ Summary: Cross-platform make system
# Source/kwsys/MD5.c is zlib # Source/kwsys/MD5.c is zlib
# some GPL-licensed bison-generated files, which all include an # some GPL-licensed bison-generated files, which all include an
# exception granting redistribution under terms of your choice # 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 URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{version}%{?versuf}.tar.gz Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz
Source1: %{name}-init.el Source1: %{name}-init.el
Source2: macros.%{name} Source2: macros.%{name}.in
# See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899
Source3: %{name}.attr Source3: %{name}.attr
Source4: %{name}.prov Source4: %{name}.prov
@ -99,10 +117,6 @@ Source5: %{name}.req
# http://public.kitware.com/Bug/view.php?id=12965 # http://public.kitware.com/Bug/view.php?id=12965
# https://bugzilla.redhat.com/show_bug.cgi?id=822796 # https://bugzilla.redhat.com/show_bug.cgi?id=822796
Patch100: %{name}-findruby.patch Patch100: %{name}-findruby.patch
# replace release flag -O3 with -O2 for fedora
%if 0%{?fedora} && 0%{?fedora} < 34
Patch101: %{name}-fedora-flag_release.patch
%endif
# Patch for renaming on EPEL # Patch for renaming on EPEL
%if 0%{?name_suffix:1} %if 0%{?name_suffix:1}
@ -132,6 +146,11 @@ BuildRequires: %{_bindir}/sphinx-build
%if %{without bootstrap} %if %{without bootstrap}
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: curl-devel BuildRequires: curl-devel
%if %{with bundled_cppdap}
Provides: bundled(cppdap)
%else
BuildRequires: cppdap-devel
%endif
BuildRequires: expat-devel BuildRequires: expat-devel
%if %{with bundled_jsoncpp} %if %{with bundled_jsoncpp}
Provides: bundled(jsoncpp) Provides: bundled(jsoncpp)
@ -139,7 +158,7 @@ Provides: bundled(jsoncpp)
BuildRequires: jsoncpp-devel BuildRequires: jsoncpp-devel
%endif %endif
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libarchive-devel >= 3.3.3 BuildRequires: libarchive-devel
%else %else
BuildRequires: libarchive3-devel BuildRequires: libarchive3-devel
%endif %endif
@ -166,7 +185,9 @@ BuildRequires: python2-devel
%endif %endif
%endif %endif
%if %{with gui} %if %{with gui}
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 9
BuildRequires: pkgconfig(Qt6Widgets)
%elif 0%{?rhel} > 7
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
%else %else
BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtGui)
@ -184,7 +205,7 @@ BuildRequires: %{name}-rpm-macros
BuildRequires: make BuildRequires: make
Requires: %{name}-data = %{version}-%{release} 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} Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
# Explicitly require make. (rhbz#1862014) # Explicitly require make. (rhbz#1862014)
@ -200,11 +221,6 @@ Provides: bundled(md5-deutsch)
# https://fedorahosted.org/fpc/ticket/555 # https://fedorahosted.org/fpc/ticket/555
Provides: bundled(kwsys) 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 %description
CMake is used to control the software compilation process using simple CMake is used to control the software compilation process using simple
platform and compiler independent configuration files. CMake generates platform and compiler independent configuration files. CMake generates
@ -218,7 +234,7 @@ generation, code generation, and template instantiation.
Summary: Common data-files for %{name} Summary: Common data-files for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-filesystem = %{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 %{with emacs}
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}} Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}}
@ -236,11 +252,6 @@ This package contains common data-files for %{name}.
Summary: Documentation for %{name} Summary: Documentation for %{name}
BuildArch: noarch BuildArch: noarch
# 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 %description doc
This package contains documentation for %{name}. This package contains documentation for %{name}.
@ -278,7 +289,7 @@ This package contains common RPM macros for %{name}.
%prep %prep
%autosetup -n %{orig_name}-%{version}%{?versuf} -p 1 %autosetup -n %{orig_name}-%{tar_version} -p 1
%if %{with rpm} %if %{with rpm}
%if %{with python3} %if %{with python3}
@ -294,22 +305,19 @@ tail -n +2 %{SOURCE5} >> %{name}.req
%build %build
%if 0%{?set_build_flags:1}
%{set_build_flags} %{set_build_flags}
%else
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS
FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
%endif
SRCDIR="$(/usr/bin/pwd)" SRCDIR="$(/usr/bin/pwd)"
mkdir %{_vpath_builddir} mkdir %{_vpath_builddir}
pushd %{_vpath_builddir} pushd %{_vpath_builddir}
$SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ $SRCDIR/bootstrap --prefix=%{_prefix} \
--docdir=/share/doc/%{name} --mandir=/share/man \ --datadir=/share/%{name} \
--docdir=/share/doc/%{name} \
--mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \ --%{?with_bootstrap:no-}system-libs \
--parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \ --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \
%if %{with bundled_cppdap}
--no-system-cppdap \
%endif
%if %{with bundled_rhash} %if %{with bundled_rhash}
--no-system-librhash \ --no-system-librhash \
%endif %endif
@ -322,9 +330,14 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
--sphinx-build=%{_bindir}/false \ --sphinx-build=%{_bindir}/false \
%endif %endif
--%{!?with_gui:no-}qt-gui \ --%{!?with_gui:no-}qt-gui \
; -- \
-DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF
popd popd
%make_build -C %{_vpath_builddir} VERBOSE=1 %make_build -C %{_vpath_builddir}
%install %install
@ -365,6 +378,10 @@ do
dname=$(basename $dir) dname=$(basename $dir)
cp -p $f ./${fname}_${dname} cp -p $f ./${fname}_${dname}
done done
%if %{with bundled_cppdap}
cp -p Utilities/cmcppdap/LICENSE LICENSE.cppdap
cp -p Utilities/cmcppdap/NOTICE NOTICE.cppdap
%endif
# Cleanup pre-installed documentation # Cleanup pre-installed documentation
%if %{with sphinx} %if %{with sphinx}
mv %{buildroot}%{_docdir}/%{name}/html . mv %{buildroot}%{_docdir}/%{name}/html .
@ -440,26 +457,24 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
%if %{with test} %if %{with test}
%check %check
pushd %{_vpath_builddir} pushd %{_vpath_builddir}
# CTestTestUpload require internet access # CTestTestUpload requires internet access.
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 NO_TEST="CTestTestUpload"
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGINFO" # Likely failing for hardening flags from system.
# kwsys.testProcess-{4,5} are flaky on s390x. NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode"
%ifarch s390x # Failing for rpm 4.19
NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-default"
%endif NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-OnePackPerGroup"
NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-AllInOne"
# RunCMake.PrecompileHeaders test uses precompiled file presumably compiled with different compiler
# that one of RHEL8 (GCC-8.3.1). See https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c4
%if 0%{?rhel} && 0%{?rhel} > 7
NO_TEST="$NO_TEST|RunCMake.PrecompileHeaders"
%endif
# curl test may fail during bootstrap # curl test may fail during bootstrap
%if %{with bootstrap} %if %{with bootstrap}
NO_TEST="$NO_TEST|curl" NO_TEST="$NO_TEST|curl"
%endif %endif
%ifarch riscv64
# These three tests timeout on riscv64, skip them.
NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink"
%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
## do this only periodically, not for every build -- rdieter 20210429 ## do this only periodically, not for every build -- besser82 20221102
# Keep an eye on failing tests # 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 popd
@ -470,6 +485,10 @@ popd
%doc %dir %{_pkgdocdir} %doc %dir %{_pkgdocdir}
%license Copyright.txt* %license Copyright.txt*
%license COPYING* %license COPYING*
%if %{with bundled_cppdap}
%license LICENSE.cppdap
%license NOTICE.cppdap
%endif
%if %{with sphinx} %if %{with sphinx}
%{_mandir}/man1/c%{name}.1.* %{_mandir}/man1/c%{name}.1.*
%{_mandir}/man1/%{name}.1.* %{_mandir}/man1/%{name}.1.*
@ -496,9 +515,12 @@ popd
%files doc %files doc
# Pickup license-files from main-pkg's license-dir %license Copyright.txt*
# If there's no license-dir they are picked up by %%doc previously %license COPYING*
%{?_licensedir:%license %{_datadir}/licenses/%{name}*} %if %{with bundled_cppdap}
%license LICENSE.cppdap
%license NOTICE.cppdap
%endif
%doc %{_pkgdocdir} %doc %{_pkgdocdir}
@ -530,56 +552,467 @@ popd
%changelog %changelog
* Fri Nov 03 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-2 * Tue Nov 05 2024 Tom Stellard <tstellar@redhat.com> - 3.30.5-2
- Fix conflict with license files. - Fix conflicting license files in cmake and cmake-doc
* Thu Oct 26 2023 Tom Stellard <tstellar@redhat.com> - 3.26.5-1 * Tue Oct 29 2024 Tom Stellard <tstellar@redhat.com> - 3.30.5-1
- Update to version 3.26.5-1 - Update version to 3.30.5
* Tue Jan 31 2023 Tom Stellard <tstellar@redhat.com> - 3.20.2-5 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.28.2-3
- Fix test case broken by git fix for CVE-2022-39253 - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Jul 09 2021 sguelton@redhat.com - 3.20.2-4 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.28.2-2
- Fix update (rhbz#1964407) - Bump release for June 2024 mass rebuild
* Thu Jun 17 2021 sguelton@redhat.com - 3.20.2-3 * Thu Feb 01 2024 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.28.2-1
- Fix rhbz#1964392 and rhbz#1964407 - cmake-3.28.2 (fixes RHBZ#2261037 and RHBZ#2243343)
* Fri Jun 04 2021 sguelton@redhat.com - 3.20.2-2 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0~rc3-4
- Minimal libarchive req - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu May 20 2021 sguelton@redhat.com - 3.20.2-1 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0~rc3-3
- Sync with Fedora rawhide. (#1957947) - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 25 2021 Tom Stellard <tstellar@redhat.com> - 3.18.2-9 * Thu Nov 23 2023 Florian Weimer <fweimer@redhat.com> - 3.28.0~rc3-2
- Sync macros from Fedora - Improve C compatibility of LoadCommand tests
* Wed Oct 28 2020 sguelton@redhat.com - 3.18.2-8 * Tue Oct 24 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc3-1
- External libarchive dependency - cmake-3.28.0-rc3
Fixes rhbz#2243343
* Mon Sep 21 2020 sguelton@redhat.com - 3.18.2-7 * Thu Oct 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc2-1
- Call update-desktop-database upon install - cmake-3.28.0-rc2
Fixes rhbz#2243343
* Sat Sep 12 2020 sguelton@redhat.com - 3.18.2-6 * Thu Oct 12 2023 Björn Esser <besser82@fedoraproject.org> - 3.28.0~rc1-1
- Declare conflict with cmake due to license files - cmake-3.28.0-rc1
Fixes rhbz#2243343
* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-5 * Sat Oct 07 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.7-1
- Declare conflict with cmake-doc due to license files - cmake-3.27.7
Fixes rhbz#2242491
* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-4 * Tue Oct 03 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.6-2
- Build on all arches - Include new upstream patches
- Restore license file location
- Restore previous appdata name
* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-3 * Wed Sep 27 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.6-1
- Fix bash-completion installation - cmake-3.27.6
- keep license files in base location Fixes rhbz#2239015, rhbz#2240311
- Include new upstream patch
* Fri Sep 11 2020 sguelton@redhat.com - 3.18.2-2 * Fri Sep 15 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.5-1
- Declare cmake vs old cmake-doc conflict - cmake-3.27.5
Fixes rhbz#2239015
* Thu Sep 10 2020 sguelton@redhat.com - 3.18.2-1 * Fri Sep 15 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-9
- Update to cmake-3.18.2 - Fix CI failure finally
* Thu Sep 14 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-8
- Fix CI failure
* Thu Sep 14 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-7
- Add upstream patches from milestone to cmake-3.27.5
* Wed Sep 06 2023 Panu Matilainen <pmatilai@redhat.com> - 3.27.4-6
- Only require cmake-rpm-macros when rpm-build is installed part II
* Sat Sep 02 2023 Tom Stellard <tstellar@redhat.com> - 3.27.4-5
- Convert license to SPDX
* Fri Sep 01 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-4
- Fix outdated CI configuration
* Thu Aug 31 2023 Panu Matilainen <pmatilai@redhat.com> - 3.27.4-3
- Only require cmake-rpm-macros when rpm-build is installed
* Mon Aug 28 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-2
- Add upstream patch to fix linking non-builtin libatomic on some arches
* Thu Aug 24 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.4-1
- cmake-3.27.4
Fixes rhbz#2233852
* Thu Aug 17 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.3-1
- cmake-3.27.3
Fixes rhbz#2232421
* Thu Aug 10 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.2-1
- cmake-3.27.2
Fixes rhbz#2231131
* Tue Jul 25 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.1-1
- cmake-3.27.1
Fixes rhbz#2226276
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.27.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 18 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0-1
- cmake-3.27.0
Fixes rhbz#2223754
* Fri Jul 14 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc5-1
- cmake-3.27.0-rc5
Fixes rhbz#2222977
* Thu Jul 06 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc4-2
- Fix FTBFS for redhat-rpm-config v260 and later
- Re-include tests that were failing with rc1
* Fri Jun 30 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc4-1
- cmake-3.27.0-rc4
Fixes rhbz#2218941
* Tue Jun 20 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc3-1
- cmake-3.27.0-rc3
Fixes rhbz#2214407
* Mon Jun 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc2-2
- Backport some upstream patches which will be included in rc3
* Mon Jun 12 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc2-1
- cmake-3.27.0-rc2
* Thu Jun 08 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc1-1
- cmake-3.27.0-rc1
- Use CMake-provided cppdap
- Add licensing information for cppdap to packaged files if needed
- Exclude tests that started failing
* Thu Jun 01 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-4
- Backport several bugfixes and support for Boost v1.82 from upstream
* Sat May 27 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-3
- Rename macros.cmake -> macros.cmake.in
- macros: Fix formatting and indentation
- macros: Directly use %%set_build_flags, as it is supported since EPEL 7
- Exclude tests that are failing for rpm 4.19
* Fri May 19 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.26.4-2
- macros: Use the language build flag macros for compiler flags
* Fri May 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.4-1
- cmake-3.26.4
Fixes rhbz#2208383
* Mon May 08 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.3-3
- Build cmake-gui with Qt6
* Fri May 05 2023 Nianqing Yao <imbearchild@outlook.com> - 3.26.3-2
- Fix build on riscv64
* Wed Apr 05 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.3-1
- cmake-3.26.3
Fixes rhbz#2184478
* Thu Mar 30 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.2-1
- cmake-3.26.2
Fixes rhbz#2182863
* Thu Mar 23 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.1-1
- cmake-3.26.1
Fixes rhbz#2181278
* Tue Mar 14 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0-1
- cmake-3.26.0
Fixes rhbz#2178221
* Thu Mar 09 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0~rc6-1
- cmake-3.26.0-rc6
Fixes rhbz#2176581
* Wed Mar 01 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0~rc5-1
- cmake-3.26.0-rc5
* Wed Feb 22 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0~rc4-1
- cmake-3.26.0-rc4
Fixes rhbz#2172604
* Wed Feb 15 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0~rc3-1
- cmake-3.26.0-rc3
Fixes rhbz#2170100
* Thu Feb 09 2023 Björn Esser <besser82@fedoraproject.org> - 3.26.0~rc2-1
- cmake-3.26.0-rc2
Fixes rhbz#2167064
* Thu Jan 19 2023 Björn Esser <besser82@fedoraproject.org> - 3.25.2-1
- cmake-3.25.2
Fixes rhbz#2162459
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Jan 15 2023 Björn Esser <besser82@fedoraproject.org> - 3.25.1-3
- Backport upstream patch for Boost v1.81 support
* Fri Jan 13 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.25.1-2
- Adjust ctest macro to use native out-of-tree support
* Mon Dec 05 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.1-1
- cmake-3.25.1
Fixes rhbz#2149681
* Wed Nov 16 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-1
- cmake-3.25.0
Fixes rhbz#2143345
* Wed Nov 09 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.6.rc4
- cmake-3.25.0-rc4
Fixes rhbz#2141122
* Wed Nov 02 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.5.rc3
- Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator,
CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject
during testsuite run
- Re-enable kwsys.testProcess-{4,5} on s390x
* Wed Nov 02 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.4.rc3
- cmake-3.25.0-rc3
Fixes rhbz#2062783
* Sun Oct 30 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.3.rc2
- Allow valid short arguments for %%ctest macro
Fixes rhbz#2127650
* Sun Oct 30 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.2.rc2
- Drop non-upstream CMAKE_DL_LIBS windows patch
Fixes rhbz#2127529
* Sat Oct 29 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.0-0.1.rc2
- cmake-3.25.0-rc2
Fixes rhbz#2062783
* Sat Oct 29 2022 Björn Esser <besser82@fedoraproject.org> - 3.24.2-1
- cmake-3.24.2
* Thu Aug 18 2022 Björn Esser <besser82@fedoraproject.org> - 3.24.1-1
- cmake-3.24.1
* Fri Aug 05 2022 Leigh Scott <leigh123linux@gmail.com> - 3.24.0-1
- cmake-3.24.0
* Fri Jul 29 2022 Leigh Scott <leigh123linux@gmail.com> - 3.23.3-1
- cmake-3.23.3
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.0-0.2.rc2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Feb 23 2022 Björn Esser <besser82@fedoraproject.org> - 3.23.0-0.1.rc2
- cmake-3.23.0-rc2
Fixes rhbz#2052100
* Tue Jan 25 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.2-1
- cmake-3.22.2
Fixes rhbz#2045074
* Thu Jan 20 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 19 2022 Björn Esser <besser82@fedoraproject.org> - 3.22.1-6
- Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO
Fixes rhbz#2041904
- Skip tests failing with GCC 12
* Sun Dec 26 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-5
- Backport two patches fixing regressions in FindBoost and FindGLUT
* Fri Dec 17 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-4
- Backport patch to add support for Python >= 3.10 in FindBoost.cmake
* Thu Dec 16 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-3
- Backport patch to add Boost 1.78 support
* Thu Dec 16 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.22.1-2
- Backport patch to add Python 3.11 support
* Tue Dec 07 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.1-1
- cmake-3.22.1
Fixes rhbz#2029974
* Thu Dec 02 2021 Stephan Bergmann <sbergman@redhat.com> - 3.22.0-4
- Fixes RPATH_CHANGE fails when shared object is a GNU ld script
* Wed Dec 01 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-3
- Update fix for rhbz#2027118 with upstream solution
* Sun Nov 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-2
- Add patch to partially revert incompatible changes in GNUInstallDirs.cmake
Fixes rhbz#2027118
* Thu Nov 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.22.0-1
- cmake-3.22.0 (#2024712)
* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.6.rc3
- cmake-3.22.0-rc3
Fixes rhbz#2022785
* Wed Nov 03 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.5.rc2
- Disable bootstrap build for jsoncpp
* Wed Nov 03 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.4.rc2
- Rebuild (jsoncpp)
* Thu Oct 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.3.rc2
- cmake-3.22.0-rc2
Fixes rhbz#2018235
- Remove debug compiler flag in macros.cmake (CMAKE_Fortran_FLAGS_RELEASE)
Fixes rhbz#2017942
* Thu Oct 28 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.2.rc1
- Revert previous changes to macros.cmake (-O2 -g)
Fixes rhbz#2017942
* Thu Oct 14 2021 Björn Esser <besser82@fedoraproject.org> - 3.22.0-0.1.rc1
- cmake-3.22.0-rc1
Fixes rhbz#2014190
- Do not build non-lto objects to reduce build time significantly
- Explicitly force optimization level 2 and debuginfo for release builds
* Mon Sep 20 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.3-1
- cmake-3.21.3
Fixes rhbz#2006054
* Wed Aug 25 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.2-1
- cmake-3.21.2
Fixes rhbz#1997708
* Tue Jul 27 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.1-1
- cmake-3.21.1
Fixes rhbz#1986449
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jul 15 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-5
- cmake-3.21.0
* Thu Jul 08 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-4.rc3
- cmake-3.21.0-rc3
* Mon Jul 05 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-3.rc2
- cmake-3.21.0-rc2
- Drop libdl patch for glibc >= 2.34, as it is upstreamed
* Tue Jun 29 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-2.rc1
- Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch
* Wed Jun 23 2021 Björn Esser <besser82@fedoraproject.org> - 3.21.0-1.rc1
- cmake-3.21.0-rc1 (#1975377)
* Mon Jun 21 2021 Björn Esser <besser82@fedoraproject.org> - 3.20.5-1
- cmake-3.20.5 (#1942118)
* Fri Jun 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.4-1
- cmake-3.20.4 (#1942118)
- workaround libdl-related FTBFS (#1972535)
* Sun May 30 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.3-1
- cmake-3.20.3
* Thu Apr 29 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.20.2-1
- cmake-3.20.2 (#1942118)
- bash-completion fixes (#1924340)
- Release build type optimization options differ from upstream package (#1751155)
- parse parallel build from %%_smp_mflags instead of _NPROCESSORS_ONLN
- drop old dist references (rhel6)
* Mon Mar 15 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.7-1
- cmake-3.19.7
* Thu Feb 25 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.6-2
- cmake-3.19.6
* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-2
- CMake warning when searching for Boost 1.75 (#1925355)
* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.4-1
- cmake-3.19.4
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 13 2021 Rex Dieter <rdieter@fedoraproject.org> - 3.19.3-1
- cmake-3.19.3
* Mon Jan 11 2021 Cristian Morales Vega <christian.morales.vega@gmail.com> - 3.19.2-1
- Update to 3.19.2
* Tue Dec 15 2020 Tom Stellard <tstellar@redhat.com> - 3.18.4-4
- Update BuildRequires for eln
* Fri Nov 20 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
- Ensure CMake does not strip binaries with package builds
* Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2
- Add support for Python 3.10
* Tue Oct 13 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.4-1
- Update to 3.18.4
* Wed Sep 30 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.3-1
- Update to 3.18.3
- Explicitly require make
- Add patch to support FlexiBLAS
* Tue Sep 29 2020 Christoph Junghans <junghans@votca.org> - 3.18.2-2
- Make %ctest non-verbose by default
* Thu Aug 20 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.2-1
- Update to 3.18.2
* Sat Aug 01 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.1-1
- Update to 3.18.1
* Wed Jul 29 2020 Orion Poplawski <orion@nwra.com> - 3.18.0-5
- Handle arguments for ctest3 macro
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-3
- Default to --verbose for ctest as well
* Sun Jul 19 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-2
- Make in-source builds behave like before
* Sat Jul 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-1.1
- Enable out-of-source builds by default
* Thu Jul 16 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-1
- Update to 3.18.0
* Sat Jul 04 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.8.rc3
- Update to 3.18.0-rc3
* Fri Jul 03 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-0.7.rc2
- Switch to implementation that is backwards compatible to older RPM
- Change control macro for in-source/out-of-source to %%__cmake_in_source_build
* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.6.rc2
- Add out-of-source builds controlled by a macro (%%__cmake_out_of_source_build)
* Wed Jul 01 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.5.rc2
- Undo out-of-source-builds
* Tue Jun 30 2020 Tom Callaway <spot@fedoraproject.org> - 3.18.0-0.4.rc2
- fix FindLua to support lua 5.4
* Mon Jun 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.3.rc2
- Apply change: CMake to do out-of-source builds (#1852036)
* Sat Jun 20 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.2.rc2
- Update to 3.18.0-rc2
* Fri Jun 12 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.1.rc1
- Update to 3.18.0-rc1
* Sat May 30 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-2
- Rebuild (jsoncpp)
* Fri May 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-1
- Update to cmake-3.17.3
* Tue Apr 28 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.2-1 * Tue Apr 28 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.2-1
- Update to cmake-3.17.2 - Update to cmake-3.17.2

28
gating.yaml Normal file
View File

@ -0,0 +1,28 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional
baseos-ci.brew-build.tier1.functional}
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional
baseos-ci.brew-build.tier1.functional}
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gating-x86_64-aarch64.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gating-s390x-ppc64le.functional}

View File

@ -7,25 +7,18 @@
%_cmake_version @@CMAKE_VERSION@@ %_cmake_version @@CMAKE_VERSION@@
%__cmake /usr/bin/cmake %__cmake /usr/bin/cmake
%__ctest /usr/bin/ctest %__ctest /usr/bin/ctest
%__cmake_in_source_build 1
%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
# - Set default compile flags # - Set default compile flags
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS # and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS
# - Turn on verbose makefiles so we can see and verify compile flags # - Turn on verbose makefiles so we can see and verify compile flags
# - Turn off stripping by default so RPM can do it separately
# - Set default install prefixes and library install directories # - Set default install prefixes and library install directories
# - Turn on shared libraries by default # - Turn on shared libraries by default
%cmake \ %cmake \
%if 0%{?set_build_flags:1} \ %{set_build_flags} \
%set_build_flags \
%else \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
%endif \
%__cmake \\\ %__cmake \\\
%{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
%{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
@ -33,6 +26,7 @@
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
@ -49,13 +43,18 @@
%cmake_install \ %cmake_install \
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
%ctest(:-:) \ %ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
cd "%{__cmake_builddir}" \ %__ctest --test-dir "%{__cmake_builddir}" \\\
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ --output-on-failure \\\
cd - --force-new-ctest-process \\\
%ifarch riscv64 \
--timeout 6000 \\\
%endif \
%{?_smp_mflags} %{**}
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake %cmake@@CMAKE_MAJOR_VERSION@@ %cmake
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build %cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**} %ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
%ctest %{**}

6
plans/ci.fmf Normal file
View File

@ -0,0 +1,6 @@
summary: CI Gating Plan
discover:
how: fmf
directory: tests
execute:
how: tmt

8
rpminspect.yaml Normal file
View File

@ -0,0 +1,8 @@
xml:
# CMake contains templates to generate XML files. These templates have some
# placeholders identified with @ symbols, which rpminspect has trouble with.
ignore:
- /usr/share/cmake/Modules/CompilerId/VS-10.vcxproj.in
- /usr/share/cmake/Modules/CompilerId/VS-Intel.vfproj.in
- /usr/share/cmake/Modules/Internal/CPack/CPack.Info.plist.in
- /usr/share/cmake/Modules/Internal/CPack/WIX.template.in

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (cmake-3.30.5.tar.gz) = 968ad4769e869378049b1d82ace98db25a6cb234b6362a51737f0d2978b8914ad42967ba112741850b23631e73b8a8876cd4f99dd0285b9da1c2bb5ea4c4ee4e

View File

@ -0,0 +1,63 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /tools/cmake/Sanity/cmake-testsuite-sanity
# Description: cmake testing by upstream testsuite
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2021 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/tools/cmake/Sanity/cmake-testsuite-sanity
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE tests
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
test -x runtest.sh || chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: cmake testing by upstream testsuite" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 1h" >> $(METADATA)
@echo "RunFor: cmake" >> $(METADATA)
@echo "Requires: cmake dnf-utils rpm-build" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA)
rhts-lint $(METADATA)

View File

@ -0,0 +1,3 @@
PURPOSE of /tools/cmake/Sanity/cmake-testsuite-sanity
Description: cmake testing by upstream testsuite
Author: Michal Kolar <mkolar@redhat.com>

View File

@ -0,0 +1,15 @@
summary: cmake testing by upstream testsuite
description: ''
contact:
- Michal Kolar <mkolar@redhat.com>
component:
- cmake
test: ./runtest.sh
framework: beakerlib
recommend:
- cmake
- dnf-utils
- rpm-build
duration: 1h
extra-summary: /tools/cmake/Sanity/cmake-testsuite-sanity
extra-task: /tools/cmake/Sanity/cmake-testsuite-sanity

View File

@ -0,0 +1,88 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /tools/cmake/Sanity/cmake-testsuite-sanity
# Description: cmake testing by upstream testsuite
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2021 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/share/beakerlib/beakerlib.sh || exit 1
BUILD_USER=${BUILD_USER:-cmkbld}
TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-50}
PACKAGE="cmake"
REQUIRES="$PACKAGE rpm-build"
if rlIsFedora; then
REQUIRES="$REQUIRES dnf-utils"
else
REQUIRES="$REQUIRES yum-utils"
fi
export CLICOLOR=0
rlJournalStart
rlPhaseStartSetup
rlShowRunningKernel
rlAssertRpm --all
rlRun "TmpDir=`mktemp -d`"
rlRun "cp tests $TmpDir"
rlRun "pushd $TmpDir"
rlFetchSrcForInstalled $PACKAGE
rlRun "useradd -M -N $BUILD_USER" 0,9
[ "$?" == "0" ] && rlRun "del=yes"
rlRun "chown -R $BUILD_USER:users $TmpDir"
rlPhaseEnd
rlPhaseStartSetup "build cmake"
rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
rlRun "dnf builddep -y $TmpDir/SPECS/*.spec"
rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`"
rlRun "cd $TmpDir/BUILD/$CMakeDir"
rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER"
rlRun "rlFileSubmit $TmpDir/bootstrap.log"
rlRun "ln -fs /usr/bin/cmake bin/cmake"
rlRun "make exit_code"
rlPhaseEnd
rlPhaseStartTest "run testsuite"
while read test; do
rlRun "su -c '/usr/bin/ctest -R \"$test\" &>>$TmpDir/testsuite.log' $BUILD_USER"
done <$TmpDir/tests
rlRun "rlFileSubmit $TmpDir/testsuite.log"
rlPhaseEnd
rlPhaseStartTest "evaluate results"
rlRun "cd $TmpDir"
rlRun "grep -E '\*\*\*(F|f)ailed' testsuite.log" 1 "There should be no failure"
rlRun "tests_count=\$(grep -E 'Test #[0-9]+: .+\.\.\. (P|p)assed' testsuite.log | wc -l)"
[ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir"
[ "$del" == "yes" ] && rlRun "userdel -f $BUILD_USER"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

View File

@ -0,0 +1,85 @@
RunCMake.CMakeRoleGlobalProperty
RunCMake.CompilerChange
RunCMake.CompilerNotFound
RunCMake.DisallowedCommands
RunCMake.ExportCompileCommands
RunCMake.ExcludeFromAll
RunCMake.ExternalData
RunCMake.FeatureSummary
RunCMake.GeneratorInstance
RunCMake.GeneratorPlatform
RunCMake.GeneratorToolset
RunCMake.GetPrerequisites
RunCMake.GNUInstallDirs
RunCMake.Languages
RunCMake.LinkStatic
RunCMake.ParseImplicitIncludeInfo
RunCMake.ParseImplicitLinkInfo
RunCMake.ScriptMode
RunCMake.TargetObjects
RunCMake.TargetProperties
RunCMake.ToolchainFile
RunCMake.find_dependency
RunCMake.CompileDefinitions
RunCMake.PolicyScope
RunCMake.WriteBasicConfigVersionFile
RunCMake.SourceProperties
RunCMake.WorkingDirectory
RunCMake.add_custom_target
RunCMake.add_dependencies
RunCMake.add_executable
RunCMake.build_command
RunCMake.cmake_minimum_required
RunCMake.cmake_parse_arguments
RunCMake.continue
RunCMake.ctest_cmake_error
RunCMake.ctest_configure
RunCMake.ctest_coverage
RunCMake.ctest_start
RunCMake.ctest_disabled_test
RunCMake.ctest_skipped_test
RunCMake.ctest_update
RunCMake.ctest_upload
RunCMake.file-CHMOD
RunCMake.find_file
RunCMake.find_library
RunCMake.find_path
RunCMake.find_program
RunCMake.foreach
RunCMake.function
RunCMake.get_filename_component
RunCMake.get_property
RunCMake.if
RunCMake.include
RunCMake.include_directories
RunCMake.include_guard
RunCMake.load_cache
RunCMake.math
RunCMake.message
RunCMake.option
RunCMake.project_injected
RunCMake.return
RunCMake.separate_arguments
RunCMake.set_property
RunCMake.string
RunCMake.test_include_dirs
RunCMake.BundleUtilities
RunCMake.try_run
RunCMake.set
RunCMake.variable_watch
RunCMake.while
RunCMake.TargetPolicies
RunCMake.no_install_prefix
RunCMake.SymlinkTrees
RunCMake.File_Archive
RunCMake.File_Configure
RunCMake.ExportWithoutLanguage
RunCMake.target_compile_definitions
RunCMake.target_compile_options
RunCMake.target_include_directories
RunCMake.target_sources
RunCMake.CommandLineTar
RunCMake.CPackCommandLine
RunCMake.CacheNewline
RunCMake.CPackSymlinks
RunCMake.CTestCommandExpandLists