diff --git a/clang.spec b/clang.spec index 5650f8a..fcc741e 100644 --- a/clang.spec +++ b/clang.spec @@ -4,7 +4,7 @@ %global min_ver 0 %global patch_ver 0 %global rc_ver 5 -%global baserelease 11 +%global baserelease 12 %global clang_tools_binaries \ %{_bindir}/clang-apply-replacements \ @@ -446,6 +446,9 @@ mkdir -p %{buildroot}%{_libdir}/clang/%{version}/{include,lib,share}/ # Remove clang-tidy headers. We don't ship the libraries for these. rm -Rvf %{buildroot}%{_includedir}/clang-tidy/ +# Add a symlink in /usr/bin to clang-format-diff +ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff + %check %if !0%{?compat_build} # requires lit.py from LLVM utilities @@ -517,6 +520,7 @@ false %{_bindir}/c-index-test %{_bindir}/find-all-symbols %{_bindir}/modularize +%{_bindir}/clang-format-diff %{_mandir}/man1/diagtool.1.gz %{_emacs_sitestartdir}/clang-format.el %{_emacs_sitestartdir}/clang-rename.el @@ -538,6 +542,10 @@ false %endif %changelog +* Wed Apr 14 2021 Tom Stellard - 12.0.0-0.12.rc5 +- Add symlink to clang-format-diff in /usr/bin +- rhbz#1939018 + * Thu Apr 08 2021 sguelton@redhat.com - 12.0.0-0.11.rc5 - New upstream release candidate diff --git a/tests/clang-format-diff/runtest.sh b/tests/clang-format-diff/runtest.sh new file mode 100755 index 0000000..d27ee13 --- /dev/null +++ b/tests/clang-format-diff/runtest.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -ex + +# Check that clang-format-diff is in PATH. +# rhbz#1939018 +clang-format-diff -h diff --git a/tests/tests.yml b/tests/tests.yml index 65426f8..c720883 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -24,6 +24,8 @@ # Required for fedora-flags: - annobin - redhat-rpm-config + # Required for clang-format-diff + - clang-tools-extra repositories: - repo: "https://src.fedoraproject.org/rpms/llvm-test-suite.git" @@ -40,3 +42,4 @@ - llvm-toolchain - fedora-flags - toolchains + - clang-format-diff