[eclipse-eclemma] Don't bundle jacoco and objectweb-asm.

[Alexander Kurtakov]

commit 5a6284a85c6f807e80520076bc40d50d55ddeb10
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu May 10 15:45:17 2012 +0300

    Don't bundle jacoco and objectweb-asm.
    
    - Drop all emma mentions.

 eclipse-eclemma-fix-jacoco-dependency.patch |    3 +-
 eclipse-eclemma-unjar-2.patch               |   35 ---------------------------
 eclipse-eclemma-unjar.patch                 |   12 ---------
 eclipse-eclemma.spec                        |   25 +++++++++----------
 4 files changed, 13 insertions(+), 62 deletions(-)
---
diff --git a/eclipse-eclemma-fix-jacoco-dependency.patch b/eclipse-eclemma-fix-jacoco-dependency.patch
index f0a7696..7148bfa 100644
--- a/eclipse-eclemma-fix-jacoco-dependency.patch
+++ b/eclipse-eclemma-fix-jacoco-dependency.patch
@@ -1,6 +1,6 @@
 --- com.mountainminds.eclemma.core/META-INF/MANIFEST.MF.bak	2012-05-07 14:26:06.269523320 +0200
 +++ com.mountainminds.eclemma.core/META-INF/MANIFEST.MF	2012-05-07 14:29:48.949528796 +0200
-@@ -16,9 +16,10 @@
+@@ -16,9 +16,9 @@
   org.eclipse.debug.core,
   org.eclipse.jdt.core,
   org.eclipse.jdt.launching,
@@ -10,7 +10,6 @@
 + org.jacoco.core;bundle-version="[0.5.6,0.5.8]",
 + org.jacoco.agent;bundle-version="[0.5.6,0.5.8]",
 + org.jacoco.report;bundle-version="[0.5.6,0.5.8]"
-+Bundle-ClassPath: emma.jar, eclemma-core.jar
  Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec
index cd41ea4..ae0f2d9 100644
--- a/eclipse-eclemma.spec
+++ b/eclipse-eclemma.spec
@@ -2,7 +2,7 @@
 
 Name:      eclipse-eclemma
 Version:   2.1.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Java code coverage tool plugin for Eclipse
 Group:     Development/Tools
 License:   EPL and ASL 2.0
@@ -12,22 +12,17 @@ URL:       http://www.eclemma.org
 # http://eclemma.svn.sourceforge.net/viewvc/eclemma/eclemma/tags/v2.1.1/?view=tar
 Source0:   eclemma-v%{version}.tar.gz
 # Unpack the emma-including plugin so we can symlink to our JAR
-Patch0:    %{name}-unjar.patch
-Patch1:    %{name}-unjar-2.patch
 Patch2:    %{name}-fix-jacoco-dependency.patch
 
 BuildArch:        noarch
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:4.2.0
-BuildRequires:    emma
 BuildRequires:    jacoco
 Requires:         java
 Requires:         jpackage-utils
 Requires:         eclipse-jdt >= 1:4.2.0
 Requires:         jacoco
-Requires:         emma
-Provides:         eclemma = %{version}-%{release}
 
 %description
 EclEmma is a Java code coverage tool for Eclipse based on the EMMA Java
@@ -37,8 +32,6 @@ editors.
 
 %prep
 %setup -q -n v%{version}
-%patch0
-%patch1
 %patch2
 
 find -name '*.class' -exec rm -f '{}' \;
@@ -55,26 +48,32 @@ ln -s %{_javadir}/jacoco/org.jacoco.report.jar
 popd
 
 %build
-eclipse-pdebuild -o `pwd`/orbitDeps -D
+eclipse-pdebuild -o `pwd`/orbitDeps
 
 %install
 install -d -m 755 %{buildroot}/%{install_loc}
 unzip -q -o -d %{buildroot}/%{install_loc} \
   build/rpmBuild/com.mountainminds.eclemma.feature.zip
 pushd %{buildroot}/%{install_loc}/eclipse/plugins
-#build-jar-repository -s -p com.mountainminds.eclemma.core_%{version} emma.jar
-#rm com.mountainminds.eclemma.core_%{version}/emma.jar
-ln -s ../../../../../../java/emma.jar com.mountainminds.eclemma.core_%{version}
+rm -fr org.jacoco*
+rm -fr org.objectweb.asm*
+ln -s %{_javadir}/jacoco/org.jacoco.agent.jar 
+ln -s %{_javadir}/jacoco/org.jacoco.core.jar 
+ln -s %{_javadir}/jacoco/org.jacoco.report.jar
+ln -s %{_javadir}/objectweb-asm/asm-all.jar
 popd
 
 %files
-%defattr(-,root,root,-)
 %doc com.mountainminds.eclemma.doc/pages/faq.html
 %doc com.mountainminds.eclemma.doc/pages/license.html
 %doc com.mountainminds.eclemma.core/about.html
 %{install_loc}
 
 %changelog
+* Thu May 10 2012 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-2
+- Don't bundle jacoco and objectweb-asm.
+- Drop all emma mentions.
+
 * Mon May 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.1.1-1
 - Update to upstream 2.1.1