diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 6d903c4..0989b0e 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -81,7 +81,7 @@
+ pushd /tmp/eclipse-tests-directory
+ rm -rf *
+ cp ${testslocation}/*.properties .
-+
++ cp ${testslocation}/library.xml .
if [ ! -r eclipse ]
then
- tar -xzf eclipse-SDK-*.tar.gz
@@ -153,11 +153,11 @@
- else
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
- fi
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2013-04-04 12:11:23.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-04-04 13:51:49.816829140 +0200
-@@ -163,99 +163,17 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2013-05-01 13:30:04.000000000 +0200
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2013-05-03 14:44:17.278068172 +0200
+@@ -175,99 +175,15 @@
-
+
-
-
@@ -234,7 +234,7 @@
-
-
+-
-
@@ -252,20 +252,19 @@
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
-@@ -283,7 +201,7 @@
+@@ -295,7 +211,7 @@
@@ -274,7 +273,7 @@
-@@ -830,6 +748,18 @@
+@@ -842,6 +758,18 @@
arg2="" />
@@ -293,58 +292,26 @@
-@@ -1221,7 +1221,7 @@
-
-
-
--
-+
-
-
-
+ value="end longRunningTests" />
-
+-
+
-+
-+
++
++
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
-
+@@ -1475,7 +1413,6 @@
+
+
+
-
-+
-
+
+@@ -1558,7 +1495,7 @@
+
+-
++
+
+
+
diff --git a/eclipse.spec b/eclipse.spec
index 42acb0d..d800be4 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -52,7 +52,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.41%{?dist}
+Release: 0.42%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -104,12 +104,6 @@ Patch10: %{pkg_name}-pdebuild-add-target.patch
# additional poms are a part of e-b
Patch11: %{pkg_name}-change-build-packagings.patch
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
-#Patch12: %{pkg_name}-build-network-native-libs.patch
-
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
-#Patch13: %{pkg_name}-build-filesystem-native-libs.patch
-
Patch14: %{pkg_name}-test-support.patch
Patch17: %{pkg_name}-secondary-arches.patch
@@ -340,9 +334,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch9
%patch10
%patch11
-#%patch12
-#%patch13
-#%patch14
+%patch14
%patch17
%patch18
%patch20
@@ -415,19 +407,6 @@ sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/ja
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
-#sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
-#sed -i -e "s/new Equinox(configuration1)/new Equinox((Map) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
-#sed -i -e "s/new Equinox(configuration2)/new Equinox((Map) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
-#sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
-
-# Other compilation problems caused by 1.4 -> 1.5 change
-#sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
-#sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
-
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=399617
-#find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
-
#This part generates secondary fragments using primary fragments.
pushd eclipse.platform.swt.binaries/bundles
@@ -541,11 +520,6 @@ pushd dropins/jdt/plugins
rm -f $f
ln -s %{_javadir}/hamcrest/core.jar $f
- #pushd org.junit_3.8.2.*
- #rm -f junit.jar
- #ln -s /usr/share/java/junit.jar
- #popd
-
rm -rf org.junit_4*
ln -s /usr/share/java/junit.jar
popd
@@ -735,6 +709,7 @@ sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%
unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/
unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
+cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
@@ -1020,6 +995,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Tue May 7 2013 Krzysztof Daniel 1:4.3.0-0.42
+- Fix tests.
+
* Thu May 02 2013 Krzysztof Daniel 1:4.3.0-0.41
- Update to latest upstream.