Move libLTO out of plugins package

llvm.spec

@@ -2,6 +2,15 @@
 %define debug_package %{nil}
 %define debugcflags %{nil}
 
+%define major %{major_ver}
+%define libname %mklibname %{name} %{major}
+%define liblto %mklibname lto %{major}
+%define devname %mklibname %{name} -d
+
+%define clang_major %{major_ver}
+%define libclang %mklibname clang %{clang_major}
+%define devclang %mklibname clang -d
+
 # clang header paths are hard-coded at compile time
 # and need adjustment whenever there's a new GCC version
 %define gcc_version %(gcc -dumpversion)
@@ -18,7 +27,7 @@
 Summary:	Low Level Virtual Machine (LLVM)
 Name:		llvm
 Version:	%{major_ver}.%{minor_ver}
-Release:	2
+Release:	3
 License:	NCSA
 Group:		Development/Other
 Url:		http://llvm.org/
@@ -102,16 +111,11 @@ LLVM plugins.
 
 %files -n %{plugins}
 %{_libdir}/BugpointPasses.so
-%{_libdir}/libLTO.so
-%{_libdir}/libLTO.so.%{maj_ver}*
 %{_libdir}/LLVMgold.so
 %{_libdir}/LLVMHello.so
 
 #----------------------------------------------------------------------------
 
-%define major %{major_ver}
-%define libname %mklibname %{name} %{major}
-
 %package -n %{libname}
 Summary:	LLVM shared libraries
 Group:		System/Libraries
@@ -128,13 +132,25 @@ programs that are dynamically linked against libLLVM.
 
 #----------------------------------------------------------------------------
 
-%define devname %mklibname -d %{name}
+%package -n %{liblto}
+Summary:	LLVM shared library
+Group:		System/Libraries
+Conflicts:	%{_lib}llvm-plugins < 6.0.0-3
+
+%description -n %{liblto}
+Shared library for the LLVM compiler infrastructure.
+
+%files -n %{liblto}
+%{_libdir}/libLTO.so.%{major}
+
+#----------------------------------------------------------------------------
 
 %package -n %{devname}
 Summary:	Development files for LLVM
 Group:		Development/Other
 Provides:	llvm-devel = %{EVRD}
 Requires:	%{libname} = %{EVRD}
+Requires:	%{liblto} = %{EVRD}
 Requires:	%{name} = %{EVRD}
 Requires:	llvm-polly = %{EVRD}
 
@@ -143,6 +159,7 @@ Provides:	llvm-polly-devel = %{EVRD}
 
 Conflicts:	llvm < 3.0-7
 Conflicts:	%{_lib}llvm3.0 < 3.0-9
+Conflicts:	%{_lib}llvm-plugins < 6.0.0-3
 
 %description -n %{devname}
 This package contains the development files for LLVM.
@@ -151,6 +168,7 @@ This package contains the development files for LLVM.
 %{_bindir}/%{name}-config
 %{_libdir}/libLLVM.so
 %{_libdir}/libLLVM*.a
+%{_libdir}/libLTO.so
 %{_libdir}/libfindAllSymbols.a
 %{_libdir}/cmake/%{name}/*
 %{_libdir}/cmake/polly/*.cmake
@@ -249,9 +267,6 @@ as libraries and designed to be loosely-coupled and extensible.
 #----------------------------------------------------------------------------
 
 %if %{with clang}
-%define clang_major %{major_ver}
-%define libclang %mklibname clang %{clang_major}
-
 %package -n %{libclang}
 Summary:	Shared library for clang
 Group:		System/Libraries
@@ -270,8 +285,6 @@ programs that are dynamically linked against libclang.
 #----------------------------------------------------------------------------
 
 %if %{with clang}
-%define devclang %mklibname -d clang
-
 %package -n %{devclang}
 Summary:	Development files for clang
 Group:		Development/Other