From 41695253033cddbf2e6114c9dc5001a3c3945901 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 28 May 2025 15:05:10 +0800 Subject: [PATCH] 3.31.7 --- cmake-3.31.6.tar.gz => cmake-3.31.7.tar.gz | 4 +- cmake.spec | 53 ++++++---------------- 2 files changed, 17 insertions(+), 40 deletions(-) rename cmake-3.31.6.tar.gz => cmake-3.31.7.tar.gz (32%) diff --git a/cmake-3.31.6.tar.gz b/cmake-3.31.7.tar.gz similarity index 32% rename from cmake-3.31.6.tar.gz rename to cmake-3.31.7.tar.gz index a724311..82c1b49 100644 --- a/cmake-3.31.6.tar.gz +++ b/cmake-3.31.7.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0 -size 11710589 +oid sha256:a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68 +size 11711975 diff --git a/cmake.spec b/cmake.spec index 32ecae4..c34202f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -12,16 +12,13 @@ %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') -%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/cmake-%{version}} -%{?rcsuf:%global relsuf .%{rcsuf}} -%{?rcsuf:%global versuf -%{rcsuf}} Name: cmake -Version: 3.31.6 +Version: 3.31.7 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 2 +Release: 1 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: https://www.cmake.org @@ -59,12 +56,9 @@ BuildRequires: bzip2-devel curl-devel expat-devel jsoncpp-devel libarchive-deve BuildRequires: libuv-devel xz-devel zlib-devel cmake-rpm-macros %endif -BuildRequires: pkgconfig(bash-completion) -%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions') - Requires: cmake-data = %{version}-%{release} cmake-rpm-macros = %{version}-%{release} Requires: cmake-filesystem = %{version}-%{release} -Provides: cmake3 = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) +Provides: cmake%{major_version} = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) %description CMake is used to control the software compilation process using simple @@ -125,7 +119,7 @@ BuildArch: noarch Documentation for cmake. %prep -%autosetup -p1 -n cmake-%{version}%{?versuf} +%autosetup -p1 -n cmake-%{version} echo '#!%{__python3}' > %{name}.prov echo '#!%{__python3}' > %{name}.req @@ -165,7 +159,7 @@ install -d %{buildroot}%{_pkgdocdir} find %{buildroot}%{_datadir}/cmake/Modules -type f | xargs chmod -x for f in ccmake cmake cpack ctest; do - ln -s $f %{buildroot}%{_bindir}/${f}3; + ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done %if %{with emacs} @@ -178,9 +172,9 @@ install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir} rm -f %{buildroot}%{_emacs_sitelispdir} %endif -install -p -m0644 -D %{S:2} %{buildroot}%{rpm_macros_dir}/macros.%{name} -sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{rpm_macros_dir}/macros.%{name} -touch -r %{S:2} %{buildroot}%{rpm_macros_dir}/macros.%{name} +install -p -m0644 -D %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} +sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} +touch -r %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} install -p -m0644 -D %{S:3} %{buildroot}%{_prefix}/lib/rpm/fileattrs/cmake.attr install -p -m0755 -D cmake.prov %{buildroot}%{_prefix}/lib/rpm/cmake.prov install -p -m0755 -D cmake.req %{buildroot}%{_prefix}/lib/rpm/cmake.req @@ -209,6 +203,8 @@ desktop-file-install --delete-original \ install -d %{buildroot}%{_metainfodir} %endif +rm -f %{buildroot}%{_datadir}/cmake/Templates/Windows/Windows_TemporaryKey.pfx + find %{buildroot}%{_datadir}/cmake -type d | sed -e 's!^%{buildroot}!%%dir "!g' -e 's!$!"!g' > data_dirs.mf find %{buildroot}%{_datadir}/cmake -type f | sed -e 's!^%{buildroot}!"!g' -e 's!$!"!g' > data_files.mf find %{buildroot}%{_libdir}/cmake -type d | sed -e 's!^%{buildroot}!%%dir "!g' -e 's!$!"!g' > lib_dirs.mf @@ -229,27 +225,6 @@ NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocInc bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure popd - -%if %{with cmake_gui} -%post gui -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/mime || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun gui -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/mime || : - update-mime-database %{_datadir}/mime &> /dev/null || : - touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans gui -update-mime-database %{_datadir}/mime &> /dev/null || : -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %files -f lib_files.mf %doc %dir %{_pkgdocdir} %license Copyright_* COPYING* Copyright.txt @@ -257,7 +232,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files data -f data_files.mf %{_datadir}/aclocal/cmake.m4 -%{_datadir}/bash-completion +%{bash_completions_dir}/* %if %{with emacs} %{_emacs_sitelispdir}/cmake %{_emacs_sitelispdir}/cmake-mode.el @@ -265,7 +240,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %{_datadir}/vim/vimfiles/indent/%{name}.vim %{_datadir}/vim/vimfiles/syntax/%{name}.vim -%exclude %{_datadir}/cmake/Templates/Windows/Windows_TemporaryKey.pfx %files filesystem -f data_dirs.mf -f lib_dirs.mf @@ -280,7 +254,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %files rpm-macros -%{rpm_macros_dir}/macros.cmake +%{_rpmmacrodir}/macros.cmake %{_rpmconfigdir}/fileattrs/cmake.attr %{_rpmconfigdir}/cmake.prov %{_rpmconfigdir}/cmake.req @@ -302,6 +276,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Wed May 28 2025 Funda Wang - 3.31.7-1 +- update to version 3.31.7 + * Fri May 16 2025 mahailiang - 3.31.6-2 - not modify lib64 to lib on sw_64 - fix sw_64 portmidi Could NOT find JNI -- Gitee