Merge branch 'f15' into f13

Split shared libraries into separate subpackage

llvm-2.7-cxx_includes.patch

@@ -0,0 +1,36 @@
+--- llvm-2.7/tools/clang/lib/Frontend/InitHeaderSearch.cpp.cxx_includes	2010-03-06 20:38:10.000000000 +0100
++++ llvm-2.7/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-06-05 13:43:03.150438148 +0200
+@@ -524,10 +524,32 @@
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
+                                 "i686-redhat-linux","", "", triple);
+ 
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
++                                "ppc64-redhat-linux", "64", "", triple);
++
+     // Fedora 12 (February-2010+)
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
+                                 "i686-redhat-linux","", "", triple);
+-      
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
++                                "ppc64-redhat-linux", "64", "", triple);
++
++    // Fedora 13
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "i686-redhat-linux","", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "x86_64-redhat-linux", "32", "", triple);
++
++    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.4",
++                                "ppc64-redhat-linux", "64", "", triple);
++
+     // openSUSE 11.1 32 bit
+     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
+                                 "i586-suse-linux", "", "", triple);

llvm.spec

@@ -12,7 +12,7 @@
 
 Name:           llvm
 Version:        2.8
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -42,6 +42,7 @@ BuildRequires:  dejagnu tcl-devel python
 %if 0%{?_with_doxygen}
 BuildRequires:  doxygen graphviz
 %endif
+Requires:       llvm-libs = %{version}-%{release}
 
 # LLVM is not supported on PPC64
 # http://llvm.org/bugs/show_bug.cgi?id=3729
@@ -81,12 +82,21 @@ Obsoletes:      %{name}-doc < %{version}-%{release}
 Documentation for the LLVM compiler infrastructure.
 
 
+%package libs
+Summary:        LLVM shared libraries
+Group:          System Environment/Libraries
+
+%description libs
+Shared libraries for the LLVM compiler infrastructure.
+
+
 %package -n clang
 Summary:        A C language family front-end for LLVM
 License:        NCSA
 Group:          Development/Languages
+Requires:       llvm = %{version}-%{release}
 # clang requires gcc; clang++ gcc-c++
-Requires:	gcc-c++
+Requires:       gcc-c++
 
 %description -n clang
 clang: noun
@@ -225,7 +235,8 @@ popd
   --with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \
       -maxdepth 0 -type d)/include \
   --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \
-  --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os}
+  --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \
+  --with-cxx-include-32bit-dir=32
 
 # FIXME file this
 # configure does not properly specify libdir
@@ -308,24 +319,23 @@ chmod -x %{buildroot}%{_libdir}/%{name}/*.a
 find examples -name 'Makefile' | xargs -0r rm -f
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%post -n clang -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%postun -n clang -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt llvm-testlog.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt
 %{_bindir}/bugpoint
 %{_bindir}/llc
 %{_bindir}/lli
 %exclude %{_bindir}/llvm-config
 %{_bindir}/llvm*
 %{_bindir}/opt
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
-%dir %{_libdir}/llvm
-%{_libdir}/llvm/*.so
 %exclude %{_mandir}/man1/clang.1.*
 %exclude %{_mandir}/man1/llvmg??.1.*
 %doc %{_mandir}/man1/*.1.*
@@ -337,12 +347,20 @@ find examples -name 'Makefile' | xargs -0r rm -f
 %{_includedir}/%{name}-c
 %{_libdir}/%{name}/*.a
 
+%files libs
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
+%dir %{_libdir}/%{name}
+%exclude %{_libdir}/%{name}/libclang.so
+%{_libdir}/%{name}/*.so
+
 %files -n clang
 %defattr(-,root,root,-)
-%doc clang-docs/* clang-testlog.txt
+%doc clang-docs/*
 %{_bindir}/clang*
 %{_bindir}/c-index-test
 %{_bindir}/tblgen
+%{_libdir}/%{name}/libclang.so
 %{_prefix}/lib/clang
 %doc %{_mandir}/man1/clang.1.*
 
@@ -394,6 +412,16 @@ find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %changelog
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-10
+- Don't include test logs; breaks multilib (# 666195)
+- Split shared libraries into separate subpackage
+
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-9
+- clang++: fix platform-specific include dirs (# 680644)
+
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-8
+- clang++: also search for platform-specific include files (# 680644)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild