[llvm/f20] Undo OpenGTL obsoletion in F20 since we got it building

Adam Jackson ajax at fedoraproject.org
Fri Apr 11 18:35:37 UTC 2014


commit fdf37f6fb7f4fd811b79e4818974ea67b68796d4
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Apr 11 14:35:24 2014 -0400

    Undo OpenGTL obsoletion in F20 since we got it building
    
    - Don't conditionalize lldb source, it does the wrong thing when koji decides
      it's cool to build the srpm on !x86.

 llvm.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 826e62b..08d8086 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -47,9 +47,7 @@ URL:            http://llvm.org/
 Source0:        %{downloadurl}/llvm-%{version}%{?prerel}.src.tar.gz
 Source1:        %{downloadurl}/clang-%{version}%{?prerel}.src.tar.gz
 Source2:        %{downloadurl}/compiler-rt-%{version}%{?prerel}.src.tar.gz
-%if %{with lldb}
 Source3:        %{downloadurl}/lldb-%{version}%{?prerel}.src.tar.gz
-%endif
 
 # multilib fixes
 Source10:       llvm-Config-config.h
@@ -125,11 +123,11 @@ Documentation for the LLVM compiler infrastructure.
 Summary:        LLVM shared libraries
 Group:          System Environment/Libraries
 ## retire OpenGTL/libQtGTL here
-Obsoletes: OpenGTL < 0.9.18-50
-Obsoletes: OpenGTL-libs < 0.9.18-50
-Obsoletes: OpenGTL-devel < 0.9.18-50
-Obsoletes: libQtGTL < 0.9.3-50
-Obsoletes: libQtGTL-devel < 0.9.3-50
+#Obsoletes: OpenGTL < 0.9.18-50
+#Obsoletes: OpenGTL-libs < 0.9.18-50
+#Obsoletes: OpenGTL-devel < 0.9.18-50
+#Obsoletes: libQtGTL < 0.9.3-50
+#Obsoletes: libQtGTL-devel < 0.9.3-50
 
 %description libs
 Shared libraries for the LLVM compiler infrastructure.
@@ -659,7 +657,12 @@ exit 0
 %endif
 
 %changelog
-* Thu Mar 27 2014 Rex Dieter <rdieter at fedoraproject.org> 3.4-6
+* Fri Apr 11 2014 Adam Jackson <ajax at redhat.com> 3.4-6
+- Undo OpenGTL obsoletion in F20 since we got it building
+- Don't conditionalize lldb source, it does the wrong thing when koji decides
+  it's cool to build the srpm on !x86.
+
+* Thu Mar 27 2014 Rex Dieter <rdieter at fedoraproject.org>
 - -libs: Obsoletes: OpenGTL libQtGTL
 
 * Wed Mar 19 2014 Dave Airlie <airlied at redhat.com> 3.4-5


More information about the scm-commits mailing list