[llvm/f13/master: 23/23] Merge branch 'f14' into f13

[Michel Alexandre Salim]

commit faa2645560884185eba29ccfa1bb81d35964025e
Merge: 90303a4 2be1863
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Oct 15 01:14:04 2010 +0200

    Merge branch 'f14' into f13
    
    Conflicts:
    	llvm.spec

 clang-2.7-nodebug.patch |   19 +++++++++++++
 llvm.spec               |   67 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 72 insertions(+), 14 deletions(-)
---
diff --cc llvm.spec
index ed190fd,f0427fd..6c271c3
--- a/llvm.spec
+++ b/llvm.spec
@@@ -252,15 -264,15 +264,21 @@@ don
  # Move documentation back to build directory
  # 
  mv %{buildroot}/moredocs .
- rm moredocs/*.tar.gz
- rm moredocs/ocamldoc/html/*.tar.gz
+ rm -f moredocs/*.tar.gz
+ rm -f moredocs/ocamldoc/html/*.tar.gz
+ 
+ # and separate the apidoc
+ %if 0%{?_with_doxygen}
+ mv moredocs/html/doxygen apidoc
+ mv tools/clang/docs/doxygen/html clang-apidoc
+ %endif
  
 +# and separate the apidoc
 +%if 0%{?_with_doxygen}
 +mv moredocs/html/doxygen apidoc
 +mv tools/clang/docs/doxygen/html clang-apidoc
 +%endif
 +
  # And prepare Clang documentation
  #
  mkdir clang-docs