[eclipse-testng/f20: 4/5] Use orbit style deps instead of symlinked libs embedded in the plug-in

[Mat Booth]

commit 387e12219fc132719b296cd8a0f2367173d93403
Author: Mat Booth <mat.booth at redhat.com>
Date:   Mon Jun 16 23:34:09 2014 +0100

    Use orbit style deps instead of symlinked libs embedded in the plug-in

 eclipse-testng-manifest.patch |   45 +++++++++++++++-------------------------
 eclipse-testng.spec           |   21 +++++++++++-------
 2 files changed, 30 insertions(+), 36 deletions(-)
---
diff --git a/eclipse-testng-manifest.patch b/eclipse-testng-manifest.patch
index 5d4dd70..b3de7fa 100644
--- a/eclipse-testng-manifest.patch
+++ b/eclipse-testng-manifest.patch
@@ -1,35 +1,24 @@
---- META-INF/MANIFEST.MF.orig	2013-06-07 15:43:58.000000000 +0100
-+++ META-INF/MANIFEST.MF	2013-06-25 16:26:35.758015714 +0100
-@@ -30,9 +30,11 @@
+--- META-INF/MANIFEST.MF.orig	2014-06-16 22:25:23.566427536 +0100
++++ META-INF/MANIFEST.MF	2014-06-16 22:26:09.740709556 +0100
+@@ -25,14 +25,15 @@
+  org.eclipse.search,
+  org.eclipse.ltk.core.refactoring,
+  org.eclipse.ltk.ui.refactoring,
+- org.eclipse.core.variables
++ org.eclipse.core.variables,
++ com.beust.jcommander,
++ org.sonatype.sisu.guice,
++ com.google.guava,
++ org.junit,
++ org.yaml.snakeyaml,
++ org.testng
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Bundle-ActivationPolicy: lazy
- Bundle-ClassPath: .,
-  lib/testng.jar,
+-Bundle-ClassPath: .,
+- lib/testng.jar,
 - lib/guava-base-r03.jar,
 - lib/guava-collections-r03.jar,
 - lib/junit-4.8.2.jar
-+ lib/beust-jcommander.jar,
-+ lib/google-guice.jar,
-+ lib/guava.jar,
-+ lib/junit.jar,
-+ lib/snakeyaml.jar
  Export-Package: 
   org.testng.eclipse,
   org.testng.eclipse.buildpath,
---- build.properties.orig	2013-06-07 15:43:58.000000000 +0100
-+++ build.properties	2013-06-25 16:27:20.262194591 +0100
-@@ -6,10 +6,10 @@
-                plugin.properties,\
-                icons/,\
-                schema/,\
--               lib/guava-collections-r03.jar,\
--               lib/guava-base-r03.jar,\
-                lib/testng.jar,\
--               lib/testng-sources.jar,\
--               lib/junit-4.8.2.jar
--
-+               lib/beust-jcommander.jar,\
-+               lib/google-guice.jar,\
-+               lib/guava.jar,\
-+               lib/junit.jar,\
-+               lib/snakeyaml.jar
- 
diff --git a/eclipse-testng.spec b/eclipse-testng.spec
index 0e8ab7d..cdb52b9 100644
--- a/eclipse-testng.spec
+++ b/eclipse-testng.spec
@@ -4,7 +4,7 @@
 
 Name:      eclipse-testng
 Version:   6.8.6
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   TestNG plug-in for Eclipse
 License:   ASL 2.0
 URL:       http://testng.org
@@ -14,6 +14,8 @@ BuildArch: noarch
 # This is a git snapshot because upstream do not tag their releases. Inspection of the contained classes
 # shows that this is the code that makes up the 6.8.6 release available in upstream's update site.
 Source0:   https://github.com/cbeust/testng-eclipse/archive/%{git_rev}.tar.gz
+
+# Use orbit style dependencies rather than embedded libs
 Patch0:    eclipse-testng-manifest.patch
 
 # This patch is sent upstream: https://github.com/cbeust/testng-eclipse/pull/115
@@ -49,7 +51,8 @@ find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
 # build against fedora packaged libs
-build-jar-repository -s -p lib guava testng junit snakeyaml google-guice beust-jcommander
+build-jar-repository -s -p lib \
+  guava testng junit snakeyaml base64coder google-guice beust-jcommander slf4j/api cglib aopalliance
 
 # the version of the plugin was (and remains) typo'd, see comments on the following commit:
 # https://github.com/cbeust/testng-eclipse/commit/86199dbcc081404466a3f7bc7117fad9461b7067
@@ -57,18 +60,17 @@ sed -i -e 's at 6\.8\.1\.20130330_0839@%{version}.qualifier at g' META-INF/MANIFEST.MF
 sed -i -e 's at 6\.1\.1\.20110823_1537@%{version}.qualifier at g' testng-eclipse-feature/feature.xml
 
 %build
-eclipse-pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+eclipse-pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o "$(pwd)/lib"
 
 %install
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -n -d %{buildroot}%{eclipse_dropin}/testng-eclipse build/rpmBuild/org.testng.eclipse.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
-# because for some reason the ant copy task doesn't preserve them, this will
-# cause some benign dangling-symlink rpmlint warnings
-pushd %{buildroot}%{eclipse_dropin}/testng-eclipse/eclipse/plugins/org.testng.eclipse_*
-rm lib/*.jar
-build-jar-repository -s -p lib guava testng junit snakeyaml google-guice beust-jcommander
+# this will cause some benign dangling-symlink rpmlint warnings
+pushd %{buildroot}%{eclipse_dropin}/testng-eclipse/eclipse/plugins
+build-jar-repository -s -p . \
+  guava testng junit snakeyaml base64coder google-guice beust-jcommander slf4j/api cglib aopalliance
 popd
 
 %files
@@ -77,6 +79,9 @@ popd
 %{eclipse_dropin}/testng-eclipse
 
 %changelog
+* Mon Jun 16 2014 Mat Booth <mat.booth at redhat.com> - 6.8.6-3
+- Use orbit style deps instead of symlinked libs embedded in the plug-in
+
 * Thu Jun 12 2014 Mat Booth <mat.booth at redhat.com> - 6.8.6-2
 - Patch for compatibility with eclipse luna