From fdf37f6fb7f4fd811b79e4818974ea67b68796d4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 11 Apr 2014 14:35:24 -0400 Subject: [PATCH] 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 file 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 3.4-6 +* Fri Apr 11 2014 Adam Jackson 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 - -libs: Obsoletes: OpenGTL libQtGTL * Wed Mar 19 2014 Dave Airlie 3.4-5