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

Update to 3.6.0-rc4

Browse Source
This commit is contained in:
Orion Poplawski 2019-11-18 21:00:59 -07:00
parent 36cafa45d7
commit 3648c4d8a2
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmake.spec
View File

@ -52,9 +52,9 @@
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global major_version 3 %global major_version 3
%global minor_version 15 %global minor_version 16
# Set to RC version if building RC, else %%{nil} # Set to RC version if building RC, else %%{nil}
#global rcsuf rc3 %global rcsuf rc4
%{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global relsuf .%{rcsuf}}
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
@ -63,8 +63,8 @@
%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: %{major_version}.%{minor_version}.0
Release: 2%{?relsuf}%{?dist} Release: 0.1%{?relsuf}%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
# most sources are BSD # most sources are BSD
@ -142,6 +142,7 @@ BuildRequires: zlib-devel
%if %{with emacs} %if %{with emacs}
BuildRequires: emacs BuildRequires: emacs
%endif %endif
BuildRequires: openssl-devel
%if %{with rpm} %if %{with rpm}
%if %{with python3} %if %{with python3}
%{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_pkgversion: %global python3_pkgversion 3}
@ -401,20 +402,12 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
%endif %endif
pushd build pushd build
#CMake.FileDownload, CTestTestUpload, and curl require internet access # CTestTestUpload require internet access
# RunCMake.CPack_RPM is broken if disttag contains "+", bug #1499151 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
NO_TEST="CMake.FileDownload|CTestTestUpload|curl|RunCMake.CPack_RPM" NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup" bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
# RunCMake.File_Generate fails on S390X # Keep an eye on failing tests
%ifarch s390x bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
NO_TEST="$NO_TEST|RunCMake.File_Generate"
NO_TEST="$NO_TEST|kwsys.testProcess-.*"
NO_TEST="$NO_TEST|CTestTestTimeout"
NO_TEST="$NO_TEST|CTestTestRerunFailed"
NO_TEST="$NO_TEST|Server"
%endif
export NO_TEST
bin/ctest%{?name_suffix} -V -E "$NO_TEST" %{?_smp_mflags}
popd popd
%if 0%{?rhel} && 0%{?rhel} <= 6 %if 0%{?rhel} && 0%{?rhel} <= 6
mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
@ -484,6 +477,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
%changelog %changelog
* Mon Nov 18 2019 Orion Poplawski <orion@nwra.com> - 3.16.0-0.1.rc4
- Update to 3.16.0-rc4
- Cleanup %%check
* Thu Nov 14 2019 Björn Esser <besser82@fedoraproject.org> - 3.15.5-2 * Thu Nov 14 2019 Björn Esser <besser82@fedoraproject.org> - 3.15.5-2
- Rebuild (jsoncpp) - Rebuild (jsoncpp)
- Exclude more tests failing on s390x - Exclude more tests failing on s390x

2
sources
View File

@ -1 +1 @@
SHA512 (cmake-3.15.5.tar.gz) = c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6 SHA512 (cmake-3.16.0-rc4.tar.gz) = 833c2aec8d19b8402bff2c7790914d2be325c3ae334038d554435214b3f702b4501cc0942e1894b745261e4932dd74ade4a790ccd917bad83bbb2435b9395572