Revisited the set of files to be installed, removed clang-doc

llvm.spec

@@ -76,13 +76,10 @@ for effective implementation, proper tail calls or garbage collection.
 
 %files
 %doc LICENSE.TXT
-%{_bindir}/FileCheck
 %{_bindir}/bugpoint
-%{_bindir}/count
 %{_bindir}/llc
 %{_bindir}/lli
 %{_bindir}/opt
-%{_bindir}/lli-child-target
 %{_bindir}/llvm-ar
 %{_bindir}/llvm-as
 %{_bindir}/llvm-bcanalyzer
@@ -104,12 +101,16 @@ for effective implementation, proper tail calls or garbage collection.
 %{_bindir}/llvm-stress
 %{_bindir}/llvm-symbolizer
 %{_bindir}/llvm-tblgen
-%{_bindir}/pp-trace
-%{_bindir}/macho-dump
-%{_bindir}/not
 %{_bindir}/llvm-cxxdump
 %{_bindir}/llvm-dsymutil
 %{_bindir}/llvm-pdbdump
+%{_bindir}/llvm-c-test
+%{_bindir}/llvm-dwp
+%{_bindir}/llvm-lib
+%{_bindir}/llvm-lto
+%{_bindir}/llvm-split
+%{_bindir}/modularize
+%{_bindir}/sancov
 %{_bindir}/verify-uselistorder
 %{_bindir}/obj2yaml
 %{_bindir}/yaml2obj
@@ -131,6 +132,9 @@ programs that are dynamically linked against libLLVM.
 %files -n %{libname}
 %{_libdir}/libLLVM-%{major}.so
 %{_libdir}/libLLVM-%{major}.%{minor_ver}.so
+%{_libdir}/BugpointPasses.so
+%{_libdir}/libLTO*.so
+%{_libdir}/LLVMgold*.so
 
 #----------------------------------------------------------------------------
 
@@ -153,15 +157,6 @@ This package contains the development files for LLVM.
 %{_libdir}/libLLVM.so
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/BugpointPasses.so
-%{_libdir}/%{name}/libLLVM*.a
-%{_libdir}/%{name}/libLLVM*.so
-%{_libdir}/%{name}/libLTO.a
-%{_libdir}/%{name}/libLTO.so
-%{_libdir}/libLTO.so
-%{_libdir}/%{name}/LLVMgold.so
-%{_libdir}/LLVMgold.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/cmake
 
@@ -207,7 +202,7 @@ short vector instructions as well as dedicated accelerators.
 %files polly
 %{_bindir}/pollycc
 %{_bindir}/pollyc++
-%{_libdir}/llvm/LLVMPolly.so
+%{_libdir}/LLVMPolly.so
 
 #----------------------------------------------------------------------------
 
@@ -248,6 +243,10 @@ Requires:	llvm = %{EVRD}
 Requires:	gcc
 Requires:	libstdc++-devel >= %{gcc_version}
 
+# We do not build clang-doc anymore
+Obsoletes:	clang-doc < %{EVRD}
+
+
 %description -n clang
 clang: noun
     1. A loud, resonant, metallic sound.
@@ -259,12 +258,9 @@ and Objective C++ front-end for the LLVM compiler. Its tools are built
 as libraries and designed to be loosely-coupled and extensible.
 
 %files -n clang
-%doc clang-docs/*
 %{_bindir}/clang*
-%{_libdir}/llvm/libmodernizeCore.a
 %{_bindir}/c-index-test
-%{_prefix}/lib/clang
-%dir %{_datadir}/clang
+%{_libdir}/clang/
 %{_datadir}/clang/clang-tidy-diff.py
 %{_datadir}/clang/run-clang-tidy.py
 %endif
@@ -284,6 +280,7 @@ Shared libraries for the clang compiler. This is needed by
 programs that are dynamically linked against libclang.
 
 %files -n %{libclang}
+%{_libdir}/libclang.so.%{clang_major}
 %{_libdir}/libclang-%{clang_major}.so
 %{_libdir}/libclang-%{clang_major}.%{minor_ver}.so
 %endif
@@ -309,9 +306,8 @@ libclang.
 %{_includedir}/clang
 %{_includedir}/clang-c
 %{_libdir}/libclang.so
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libclang*.a
-%{_libdir}/%{name}/libclang*.so
+%dir %{_datadir}/clang/
+%{_datadir}/clang/cmake/
 %endif
 
 #----------------------------------------------------------------------------
@@ -333,25 +329,13 @@ programs. The standalone tool is invoked from the command-line, and is
 intended to run in tandem with a build of a project or code base.
 
 %files -n clang-analyzer
-%{_bindir}/scan-build
 %{_bindir}/scan-view
-%{_libdir}/clang-analyzer
-%endif
-
-#----------------------------------------------------------------------------
-
-%if %{with clang}
-%package -n clang-doc
-Summary:	Documentation for Clang
-Group:		Books/Computer books
-BuildArch:	noarch
-Requires:	%{name} = %{EVRD}
-
-%description -n clang-doc
-Documentation for the Clang compiler front-end.
-
-%files -n clang-doc
-%doc clang-docs-full/*
+%{_bindir}/scan-build
+%{_prefix}/libexec/ccc-analyzer
+%{_prefix}/libexec/c++-analyzer
+%{_datadir}/scan-view/
+%{_datadir}/scan-build/
+%{_mandir}/man1/scan-build.1.*
 %endif
 
 #----------------------------------------------------------------------------
@@ -446,3 +430,20 @@ exec %{_bindir}/clang++ -O3 -Xclang -load -Xclang %{_libdir}/LLVMPolly.so "$@"
 EOF
 chmod 0755 %{buildroot}%{_bindir}/pollycc %{buildroot}%{_bindir}/pollyc++
 
+# An example plugin, not really needed.
+rm -f %{buildroot}%{_libdir}/LLVMHello.so
+
+# Static libraries, not needed.
+rm -f %{buildroot}%{_libdir}/*.a
+
+%if %{with clang}
+# Clang - Git integration. Not needed.
+	rm -f %{buildroot}%{_bindir}/git-clang-format
+
+# Remove editor integration files
+	rm -f %{buildroot}%{_datadir}/clang/clang-format*
+
+# Symlinks for libclang to maintain compatibility with the older releases.
+	ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.so
+	ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.%{minor_ver}.so
+%endif