[eclipse] Move testbundle-to-eclipse-test into eclipse-build upstream.

[Roland Grunberg]

commit d50acf123755b35518cca303e4ba9d8f2aa881de
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Oct 10 14:53:51 2013 -0400

    Move testbundle-to-eclipse-test into eclipse-build upstream.

 .gitignore   |    1 +
 eclipse.spec |   13 ++++++-------
 sources      |    3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afabbd3..08dd108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 eclipse-*-src.tar.bz2
 *.rpm
 eclipse-build-*.tar.gz
+eclipse-build-*.tar.xz
 eclipse-3.8.0-*-src.tar.bz2
 eclipse-4.2.0-I20120405-1114-src.tar.bz2
 /R4_platform-aggregator-*
diff --git a/eclipse.spec b/eclipse.spec
index d560020..3ce3c05 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -9,8 +9,7 @@ Epoch:                  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   1
 %global initialize      1
-%global eb_commit       60a5a559fd746d946d869720c889bc698d9e6ab3
-%global tb_commit       799cfaa9dea173f10b2ec8eecedfa60f33a26498
+%global eb_commit       184e7d27ebc828b60cbbf8e661c0f29a9a7ba09c
 %global eclipse_tag     R4_3_1
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{pkg_name}
@@ -52,7 +51,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -60,8 +59,6 @@ URL:            http://www.eclipse.org/
 Source0:        R4_platform-aggregator-%{eclipse_tag}.tar.xz
 #http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
 Source1:        eclipse-build-%{eb_commit}.tar.xz
-# http://fedorapeople.org/cgit/rgrunber/public_git/testbundle-to-eclipse-test.git/snapshot/testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz
-Source2:        testbundle-to-eclipse-test-%{tb_commit}.tar.xz
 
 # -com.sun.el
 # +javax.el
@@ -746,10 +743,9 @@ echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{
 echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >>  $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
 
 # Package testbundle-to-eclipse-test
-mkdir -p $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
+cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
 
 pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
-tar --strip-components=1 -xf %{SOURCE2}
 
 # Set the proper paths for scripts
 sed -i 's|\.\+/\(gatherBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepRuntimeLocation.sh
@@ -1028,6 +1024,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Oct 10 2013 Roland Grunberg <rgrunber at redhat.com> - 1:4.3.1-3
+- Move testbundle-to-eclipse-test into eclipse-build upstream.
+
 * Thu Oct 10 2013 Roland Grunberg <rgrunber at redhat.com> - 1:4.3.1-2
 - Add testbundle-to-eclipse-test script.
 
diff --git a/sources b/sources
index e1b84c8..16a3249 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 0408d6c5f1808b963f4981fda8123b3a  R4_platform-aggregator-R4_3_1.tar.xz
-23f433f7a884c8029fe903cd1e70a8d7  eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
-6e9da29a7df523277fc132c8bfaf512a  testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz
+44e6c0cf91b30db75bf5aa0f9bb734ed  eclipse-build-184e7d27ebc828b60cbbf8e661c0f29a9a7ba09c.tar.xz