[eclipse-cdt] Remove unneeded objectweb-asm dependency.

[Jeff Johnston]

commit 75ec873bba8f2f4666fa8ad4538b23a34d8be66b
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Oct 3 19:00:50 2012 -0400

    Remove unneeded objectweb-asm dependency.
    
    - Add special flags so build will work with tycho 0.16.
    - Fix up zip file name since tycho 0.16 changed it.

 eclipse-cdt.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 0626459..3cacd50 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -27,7 +27,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -59,13 +59,12 @@ BuildRequires: eclipse-pde >= 1:3.8.0
 BuildRequires: eclipse-rse >= 3.3
 BuildRequires: maven >= 3.0.3
 BuildRequires:  java-devel >= 1.4.2
-BuildRequires: objectweb-asm >= 3.2
 BuildRequires: lpg-java-compat
+BuildRequires: eclipse-platform >= 1:3.8.0
 
 Requires:       gdb make gcc-c++ autoconf automake libtool
 Requires:       eclipse-platform >= 1:3.8.0
 Requires:	eclipse-rse >= 3.3
-Requires:	objectweb-asm >= 3.2
 
 %if 0%{?rhel} >= 6
 ExclusiveArch: %{ix86} x86_64
@@ -160,10 +159,10 @@ pushd core/org.eclipse.cdt.core.linux/library
 make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
 
-mvn-rpmbuild -o -DforceContextQualifier=%{build_id} -fae clean install
+mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -Dtycho.local.keepTarget -DforceContextQualifier=%{build_id} -fae clean install
 
 ## Libhover has dependencies on CDT so we must add these to the SDK directory
-unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
+unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-%{version}-SNAPSHOT.zip -d $SDK
 popd
 
 ## Libhover build
@@ -187,7 +186,7 @@ install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
 # Unzip contents of the cdt repo, removing all but plugins and features
-unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
+unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-%{version}-SNAPSHOT.zip \
 -d $installDir/eclipse
 
 # Unpack all existing feature jars
@@ -254,6 +253,11 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Wed Oct 03 2012 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.0-3
+- Remove unneeded objectweb-asm dependency.
+- Add special flags so build will work with tycho 0.16.
+- Fix up zip file name since tycho 0.16 changed it.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:8.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild