From 281615b36a4d6d56fa709875e592b925da5a6488 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Thu, 14 Dec 2023 16:19:44 +0800 Subject: [PATCH] Fix abnormal empty link in cmake-data package (cherry picked from commit 733aeb2dc9591414781979f6a8fd0ae04229dbd9) --- cmake.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1fbf370..146b186 100644 --- a/cmake.spec +++ b/cmake.spec @@ -11,7 +11,7 @@ Name: cmake Version: 3.22.0 -Release: 6 +Release: 7 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -44,6 +44,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) @@ -134,11 +137,6 @@ for f in ccmake cmake cpack ctest; do ln -s $f %{buildroot}%{_bindir}/${f}3; done -install -d %{buildroot}%{_datadir}/bash-completion/completions -for f in %{buildroot}%{_datadir}/cmake/completions/* -do - ln -s ../../cmake/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions -done install -d %{buildroot}%{_emacs_sitelispdir}/cmake install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/cmake/cmake-mode.el @@ -204,7 +202,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files data -f data_files.mf %{_datadir}/aclocal/cmake.m4 -%{_datadir}/bash-completion +%{bash_completionsdir}/c* %{_emacs_sitelispdir}/cmake %{_emacs_sitelispdir}/cmake-mode.el %{_emacs_sitestartdir}/cmake-init.el @@ -238,6 +236,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Dec 14 2023 liyanan - 3.22.0-7 +- Fix abnormal empty link in cmake-data package + * Thu Aug 10 2023 herengui - 3.22.0-6 - fix sw_64 portmidi Could NOT find JNI -- Gitee