[eclipse-testframework] Update to 3.7 Eclipse SDK test framework

[Andrew Overholt]

commit 62610fe159a4ace27f15513c805ba6f230f7ea41
Author: Andrew Overholt <overholt at redhat.com>
Date:   Wed Jul 6 11:15:09 2011 -0400

    Update to 3.7 Eclipse SDK test framework

 .gitignore                         |    2 ++
 eclipse-testframework-fetch-src.sh |    3 +++
 eclipse-testframework.spec         |   28 ++++++++++++++++------------
 sources                            |    2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3da4314..0d113ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 eclipse-testframework-fetched-src-R3_6.tar.bz2
 /eclipse-testframework-fetched-src-R3_6_1.tar.bz2
+/eclipse-testframework-fetched-src-R3_7
+eclipse-testframework-fetched-src-R3_7.tar.bz2
diff --git a/eclipse-testframework-fetch-src.sh b/eclipse-testframework-fetch-src.sh
index 4b777ce..ce6c85e 100644
--- a/eclipse-testframework-fetch-src.sh
+++ b/eclipse-testframework-fetch-src.sh
@@ -22,6 +22,9 @@ org.eclipse.test-feature \
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse export -r $tag $f;
 done
 
+# Remove code coverage JARs
+rm org.eclipse.test/lib/jaco*.jar
+
 popd
 # create archive
 tar -cjf $tar_name.tar.bz2 $tar_name
diff --git a/eclipse-testframework.spec b/eclipse-testframework.spec
index 835649b..ed4074d 100644
--- a/eclipse-testframework.spec
+++ b/eclipse-testframework.spec
@@ -1,10 +1,12 @@
 %global eclipse_base   %{_libdir}/eclipse
 %global install_loc    %{_datadir}/eclipse/dropins/testframework
-%global tag            R3_6_1
+%global tag            R3_7
+
+%global easymockVerQual 2.4.0.v20090202-0900
 
 Name:           eclipse-testframework
-Version:        3.6.1
-Release:        2%{?dist}
+Version:        3.7.0
+Release:        1%{?dist}
 Summary:        Eclipse Test Framework
 
 Group:          Development/Tools
@@ -16,15 +18,15 @@ Source1:        %{name}-fetch-src.sh
 # Remove win32 fragment from test feature
 Patch0:         eclipse-nowin32testfragment.patch
 # Some fixes for library.xml
-# FIXME:  submit upstream
-Patch1:        eclipse-tests-libraryXml.patch
+# FIXME:  submit parts of this upstream to make tests pwd-agnostic
+Patch1:         %{name}-libraryXml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: eclipse-pde >= 1:3.5.0
 BuildRequires: easymock2
-Requires: eclipse-platform >= 3.4.0
+Requires: eclipse-platform >= 3.5.0
 Requires: easymock2
 Requires: eclipse-jdt
 
@@ -33,14 +35,13 @@ Eclipse Test Framework. Used in conjunction with Eclipse JUnit tests.
 
 %prep
 %setup -q -n %{name}-fetched-src-%{tag}
-chmod -x org.eclipse.test-feature/*.html
 %patch0
 %patch1
 sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
 
 mkdir orbitDeps
 pushd orbitDeps
-ln -s %{_javadir}/easymock2.jar org.easymock_2.4.0.v20090202-0900.jar
+ln -s %{_javadir}/easymock2.jar org.easymock_%{easymockVerQual}.jar
 popd
 
 %build
@@ -55,8 +56,8 @@ install -d -m 755 %{buildroot}%{install_loc}
 
 pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins
 rm -fr org.junit*
-rm org.easymock_2.4.0.v20090202-0900.jar
-ln -s ../../../../../java/easymock2.jar org.easymock_2.4.0.v20090202-0900.jar
+rm org.easymock_%{easymockVerQual}.jar
+ln -s ../../../../../java/easymock2.jar org.easymock_%{easymockVerQual}.jar
 popd
 
 %clean
@@ -65,10 +66,13 @@ popd
 %files
 %defattr(-,root,root,-)
 %{install_loc}
-%doc org.eclipse.test-feature/license.html
-%doc org.eclipse.test-feature/epl-v10.html
+%doc org.eclipse.test/about.html
+%doc org.eclipse.test-feature/rootfiles/epl-v10.html
 
 %changelog
+* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 3.7.0-1
+- Update to 3.7.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index be67eca..96d52d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5531d4fe13a3c09312e8b9e5a47d9d32  eclipse-testframework-fetched-src-R3_6_1.tar.bz2
+2a32bacac509f33137c18cf66c468a8b  eclipse-testframework-fetched-src-R3_7.tar.bz2