rpms/eclipse/F-12 eclipse-junit-dropins.patch, NONE, 1.1 eclipse.spec, 1.676, 1.677

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23609/F-12

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-junit-dropins.patch 
Log Message:
Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).

eclipse-junit-dropins.patch:
 P2Utils.java |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

--- NEW FILE eclipse-junit-dropins.patch ---
--- plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+++ plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
@@ -90,6 +90,21 @@ class P2Utils {
 		try {
 			URL bundlesTxt= new URL(bundlesLocationURL.getProtocol(), bundlesLocationURL.getHost(), new File(bundlesLocationURL.getFile(), bundleInfoPath).getAbsolutePath());
 			BundleInfo bundles[]= getBundlesFromFile(bundlesLocationURL, bundlesTxt);
+			if (useConfigArea) {
+				// the config area may have relative URLs that should be
+				// resolved to the install location.
+				URL installLocationURL = Platform.getInstallLocation().getURL();
+				BundleInfo installBundles[]= getBundlesFromFile(installLocationURL, bundlesTxt);
+				if (bundles == null || bundles.length == 0) {
+					bundles = installBundles;
+				}
+				else if (installBundles != null && installBundles.length > 0) {
+					BundleInfo mergedBundles[] = new BundleInfo[bundles.length + installBundles.length];
+					System.arraycopy(bundles, 0, mergedBundles, 0, bundles.length);
+					System.arraycopy(installBundles, 0, mergedBundles, bundles.length, installBundles.length);
+					bundles = mergedBundles;
+				}
+			}
 			if (bundles == null || bundles.length == 0) {
 				return null;
 			}


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -p -r1.676 -r1.677
--- eclipse.spec	17 Nov 2009 12:34:31 -0000	1.676
+++ eclipse.spec	16 Dec 2009 14:40:44 -0000	1.677
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        20%{?dist}
+Release:        21%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -47,6 +47,7 @@ Source28:       %{name}-mv-Platform.sh
 Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
+Patch2:        %{name}-junit-dropins.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -388,6 +389,7 @@ fi
 %patch0 -p0
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 %patch1
+%patch2
 popd
 
 %build
@@ -1104,6 +1106,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Wed Dec 16 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-21
+- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
+
 * Tue Nov 17 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-20
 - Fix ppc64 swt jar version.