From 66560720bc2fdd1341fc0b7a8fbf0225514b6cf3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 29 2021 14:01:56 +0000 Subject: import cmake-3.18.2-11.el8_4 --- diff --git a/SPECS/cmake.spec b/SPECS/cmake.spec index bb0653c..db27790 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -61,7 +61,7 @@ %global minor_version 18 %global patch_version 2 -%global baserelease 9 +%global baserelease 11 # Set to RC version if building RC, else %%{nil} #global rcsuf rc3 @@ -135,9 +135,9 @@ BuildRequires: expat-devel %if %{without bundled_jsoncpp} BuildRequires: jsoncpp-devel %endif -# Needed libarchive >= 3.3.3 + %if %{without bundled_libarchive} -BuildRequires: libarchive-devel +BuildRequires: libarchive-devel >= 3.3.3 %endif BuildRequires: libuv-devel BuildRequires: xz-devel @@ -176,6 +176,9 @@ Requires: %{name}-data = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} +# Provide the major version name +Provides: %{orig_name}%{major_version} = %{version}-%{release} + # Source/kwsys/MD5.c # see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries Provides: bundled(md5-deutsch) @@ -190,6 +193,8 @@ Provides: bundled(libarchive) = 0:3.3.3 Provides: bundled(json-cpp) = 0:1.8.2 %endif +%{?name_suffix:Provides: %{orig_name} = %{version}} + Conflicts: %{name}-doc < %{version} %description @@ -320,6 +325,9 @@ find %{buildroot}%{_datadir}/%{name}/Modules -type f | xargs chmod -x echo "Found .orig files in %{_datadir}/%{name}/Modules, rebase patches" && exit 1 +# Install major_version name links +%{!?name_suffix:for f in ccmake cmake cpack ctest; do ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done} + %if %{with emacs} # Install emacs cmake mode mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} @@ -504,6 +512,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Jun 03 2021 sguelton@redhat.com - 3.18.2-11 +- Minimal libarchive req (#1965373) + +* Fri May 28 2021 sguelton@redhat.com - 3.18.2-10 +- Restore major version symlinks + * Mon Jan 25 2021 Tom Stellard - 3.18.2-9 - Sync macros from Fedora