[llvm] llvm 3.3-rc2

[Adam Jackson]

commit dd9e07d29feeb57f77a5263da19853093f0e5b23
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue May 28 11:33:43 2013 -0400

    llvm 3.3-rc2

 .gitignore |    2 ++
 llvm.spec  |   25 ++++++++++++-------------
 sources    |    4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78eed2e..ec4aa17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 /clang-20130507.tar.xz
 /compiler-rt-20130507.tar.xz
 /llvm-20130507.tar.xz
+/cfe-3.3rc2-source.tar.gz
+/llvm-3.3rc2-source.tar.gz
diff --git a/llvm.spec b/llvm.spec
index 4290ca0..78f0096 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -23,7 +23,7 @@
 %bcond_with crt
 %bcond_without clang
 
-#global prerel rcX
+%global prerel rc2
 %global downloadurl http://llvm.org/%{?prerel:pre-}releases/%{version}%{?prerel:/%{prerel}}
 
 %global gitdate 20130507
@@ -39,16 +39,16 @@
 
 Name:           llvm
 Version:        3.3
-Release:        0.3.%{gitdate}%{?dist}
+Release:        0.4.%{prerel}%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
 License:        NCSA
 URL:            http://llvm.org/
-#Source0:        %{downloadurl}/llvm-%{version}%{?prerel:%{prerel}}.src.tar.gz
-#Source1:        %{downloadurl}/clang-%{version}%{?prerel:%{prerel}}.src.tar.gz
-Source0:	llvm-%{gitdate}.tar.xz
-Source1:	clang-%{gitdate}.tar.xz
+Source0:        %{downloadurl}/llvm-%{version}%{?prerel:%{prerel}}-source.tar.gz
+Source1:        %{downloadurl}/cfe-%{version}%{?prerel:%{prerel}}-source.tar.gz
+#Source0:	llvm-%{gitdate}.tar.xz
+#Source1:	clang-%{gitdate}.tar.xz
 Source2:	compiler-rt-%{gitdate}.tar.xz
 # multilib fixes
 Source10:        llvm-Config-config.h
@@ -275,14 +275,10 @@ HTML documentation for LLVM's OCaml binding.
 
 %prep
 #setup -q -n llvm-%{version}%{?prerel}.src %{?with_clang:-a1} %{?with_crt:-a2}
-%setup -q -n llvm-%{gitdate} %{?with_clang:-a1} %{?with_crt:-a2}
-rm -r -f tools/clang
-rm -r -f llvm/projects/compiler-rt
+%setup -q -n llvm.src %{?with_clang:-a1} %{?with_crt:-a2}
+rm -f tools/clang
 %if %{with clang}
-mv clang-*/ tools/clang
-%endif
-%if %{with crt}
-mv compiler-rt-*/ projects/compiler-rt
+mv cfe.src tools/clang
 %endif
 
 # llvm patches
@@ -573,6 +569,9 @@ exit 0
 %endif
 
 %changelog
+* Tue May 28 2013 Adam Jackson <ajax at redhat.com> 3.3-0.4.rc2
+- llvm 3.3-rc2
+
 * Sat May 18 2013 Peter Robinson <pbrobinson at fedoraproject.org> 3.3-0.3.20130507
 - Enable aarch64 target
 
diff --git a/sources b/sources
index d83f9f9..0a629f7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f033b786761165f5b2cbe00ed861152b  clang-20130507.tar.xz
 f113764a80fc87ad2b5898b156fa8f4b  compiler-rt-20130507.tar.xz
-f8313d30e86c7f352f77da3521ead4da  llvm-20130507.tar.xz
+5519f4bac1e038829fce0b8f34a74792  cfe-3.3rc2-source.tar.gz
+063396afe869f515abbdb76673d22b69  llvm-3.3rc2-source.tar.gz