From 3cc5391899f09c0961d43686809b02ad7184ac5b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 19 Sep 2024 07:47:59 +0000 Subject: [PATCH] Remove clang-rename Removed in https://github.com/llvm/llvm-project/pull/108988. --- files.spec.inc | 8 ++++++++ install.spec.inc | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/files.spec.inc b/files.spec.inc index 6e4b814..13d108c 100644 --- a/files.spec.inc +++ b/files.spec.inc @@ -457,7 +457,9 @@ %{install_bindir}/clang-pseudo %{install_bindir}/clang-query %{install_bindir}/clang-refactor +%if %{maj_ver} < 20 %{install_bindir}/clang-rename +%endif %{install_bindir}/clang-reorder-fields %{install_bindir}/clang-repl %{install_bindir}/clang-scan-deps @@ -491,7 +493,9 @@ %{_bindir}/clang-pseudo-%{maj_ver} %{_bindir}/clang-query-%{maj_ver} %{_bindir}/clang-refactor-%{maj_ver} +%if %{maj_ver} < 20 %{_bindir}/clang-rename-%{maj_ver} +%endif %{_bindir}/clang-reorder-fields-%{maj_ver} %{_bindir}/clang-repl-%{maj_ver} %{_bindir}/clang-scan-deps-%{maj_ver} @@ -508,7 +512,9 @@ %{_bindir}/run-clang-tidy-%{maj_ver} %else %{_emacs_sitestartdir}/clang-format.el +%if %{maj_ver} < 20 %{_emacs_sitestartdir}/clang-rename.el +%endif %{_emacs_sitestartdir}/clang-include-fixer.el %endif %{_mandir}/man1/diagtool%{exec_suffix}.1.gz @@ -518,7 +524,9 @@ %{install_datadir}/clang/clang-include-fixer.py* %{install_datadir}/clang/clang-tidy-diff.py* %{install_datadir}/clang/run-find-all-symbols.py* +%if %{maj_ver} < 20 %{install_datadir}/clang/clang-rename.py* +%endif %files -n %{pkg_name_clang}-tools-extra-devel diff --git a/install.spec.inc b/install.spec.inc index 49916e7..fa45899 100644 --- a/install.spec.inc +++ b/install.spec.inc @@ -97,9 +97,12 @@ mv %{buildroot}%{_prefix}/lib/{libear,libscanbuild} %{buildroot}%{python3_siteli # Move emacs integration files to the correct directory mkdir -p %{buildroot}%{_emacs_sitestartdir} -for f in clang-format.el clang-rename.el clang-include-fixer.el; do +for f in clang-format.el clang-include-fixer.el; do mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f done +%if %{maj_ver} < 20 +mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/clang-rename.el +%endif # Add clang++-{version} symlink ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}