diff --git a/.cvsignore b/.cvsignore
index 03e5762..8f52be7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,15 +1,4 @@
ecf-filetransfer-v20080611-1715.tar.bz2
eclipse-ecj-gcj.tar.bz2
-eclipse-fileinitializerapp.tar.bz2
-eclipse-sourceBuild-srcIncluded-3.4.1.zip
-eclipse-3.4.1-testframework.tar.bz2
-pre320changelog.txt
-eclipse-sourceBuild-srcIncluded-3.4.2.zip
-eclipse-3.4.2-testframework.tar.bz2
-eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
-eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
eclipse-I20090611-1540-fetched-src.tar.bz2
-eclipse-3.5.0-testframework.tar.bz2
-eclipse-build-generatedScripts.tar.bz2
-eclipse-build-R0_0_2_1.tar.gz
eclipse-build-R0_3_0.tar.gz
diff --git a/eclipse-nowin32testfragment.patch b/eclipse-nowin32testfragment.patch
deleted file mode 100644
index a280f6e..0000000
--- a/eclipse-nowin32testfragment.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up ./org.eclipse.test-feature/feature.xml.nowin32 ./org.eclipse.test-feature/feature.xml
---- ./org.eclipse.test-feature/feature.xml.nowin32 2008-08-27 10:14:56.000000000 -0400
-+++ ./org.eclipse.test-feature/feature.xml 2008-08-27 10:15:04.000000000 -0400
-@@ -58,14 +58,6 @@
- unpack="false"/>
-
-
--
--
-
-
--
--
-+
-
-
-
-@@ -33,25 +33,30 @@
-
-
-
--
-+
-
-
-
-
-+
-+
-+
-
-
-+
-+
-
--
-+
-
-
-
--
-+
-
-
-
-
-
--
-+
-
-
-
-@@ -60,13 +65,17 @@
-
-
-
--
--
-+
-+
-+
-+
-+
-+
-
--
--
-+
-+
-
--
-+
-
-
-@@ -75,7 +84,7 @@
-
-
-
--
-+
-
-
-
-@@ -83,15 +92,31 @@
-
-
-
-+
-+
-+
-+
-
--
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
--
--
-+
-+
-
--
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -107,11 +132,11 @@
-
-
-
--
-+
-
-
--
--
-+
-+
-
-
-
-@@ -125,10 +150,12 @@
-
-
-
-+
-+
-
-
-
--
-+
-
-
-
-@@ -138,7 +165,7 @@
-
-
-
--
-@@ -153,13 +180,13 @@
-
-
--
--
-+
-+
-
-
-
diff --git a/eclipse.spec b/eclipse.spec
index 84d0e87..f9837bb 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,7 +30,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -58,18 +58,6 @@ Source26: ecf-filetransfer-feature.xml
Source27: ecf-filetransfer-build.properties
# This script copies the platform sub-set of the SDK for generating metadata
Source28: %{name}-mv-Platform.sh
-# Test feature and plugins
-# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer
-# mkdir %{name}-%{version}-testframework; cd %{name}-%{version}-testframework
-# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse export -r R3_4 \
-# org.eclipse.test \
-# org.eclipse.test.performance \
-# org.eclipse.test-feature \
-# org.eclipse.ant.optional.junit
-# tar cjf %{name}-%{version}-testframework.tar.bz2 \
-# %{name}-%{version}-testframework
-# (generated 2009-07-23)
-Source30: %{name}-%{version}-testframework.tar.bz2
# Build swttools.jar before generation on 64-bit platforms.
# Build SWT native libraries
@@ -122,13 +110,6 @@ Patch37: %{name}-nojarsignatures.patch
#Patch39: %{name}-profilesync-e.o242632.patch
#Patch40: %{name}-profilesync-e.o242632-2.patch
-# Remove win32 fragment from test feature
-Patch41: %{name}-nowin32testfragment.patch
-
-# Some fixes for library.xml
-# FIXME: submit upstream
-Patch42: %{name}-tests-libraryXml.patch
-
Patch43: %{name}-osgi-classpath.patch
Patch44: %{name}-fix-javahome64.patch
@@ -648,16 +629,6 @@ fi
#popd
#popd
-# Test framework
-tar jxf %{SOURCE30}
-pushd %{name}-%{version}-testframework
-%patch41
-pushd org.eclipse.test
-%patch42
-popd
-sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
-popd
-
%patch43
%patch44
%patch47
@@ -706,35 +677,6 @@ popd
#
#popd
-# Build the test framework
-#pushd %{name}-%{version}-testframework
-#mkdir -p build
-
-# The qualifier is what is in upstream's release:
-# http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-test-framework-3.4.zip
-#java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-# -Duser.home=$homedir \
-# org.eclipse.core.launcher.Main \
-# -application org.eclipse.ant.core.antRunner \
-# -Dtype=feature \
-# -Did=org.eclipse.test \
-# -DsourceDirectory=$(pwd) \
-# -DbaseLocation=$SDK \
-# -DforceContextQualifier=v20080507 \
-# -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \
-# -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-#popd
-
-#TODO verify this is the correct place
-#pushd %{name}-%{version}-testframework
-#unzip build/rpmBuild/org.eclipse.test.zip
-## These are already in the SDK
-#rm eclipse/epl-v10.html eclipse/notice.html
-#rm -rf eclipse/plugins/org.junit*
-#rm build/rpmBuild/org.eclipse.test.zip
-#zip -r build/rpmBuild/org.eclipse.test.zip eclipse
-#popd
-
%install
rm -rf $RPM_BUILD_ROOT
# Get swt version
@@ -771,11 +713,6 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
#rm -rf \
# $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
-# Test framework
-#unzip -d $RPM_BUILD_ROOT%{_libdir} \
-# %{name}-%{version}-testframework/build/rpmBuild/org.eclipse.test.zip
-#mv $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.test{_3.2.0,}
-
LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
installDir=$sdkDir-Platform
@@ -1468,6 +1405,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Aug 31 2009 Alexander Kurtakov 1:3.5.0-0.9
+- Remove all testframework sources, patches, build and etc.
+
* Tue Aug 18 2009 Alexander Kurtakov 1:3.5.0-0.8
- Use system hamcrest.
diff --git a/sources b/sources
index 484fbb2..25cd015 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
72a590190a4fea7a4f8885bfe26a3e18 eclipse-I20090611-1540-fetched-src.tar.bz2
-67c8679981ee3020ec2709d85cfaf4b1 eclipse-3.5.0-testframework.tar.bz2
a3504fedff088a6e58a39d43fff4d47e eclipse-build-R0_3_0.tar.gz