diff --git a/eclipse.spec b/eclipse.spec
index 3b781ce..3497394 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.6%{?dist}
+Release: 0.7%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -42,10 +42,6 @@ Source17: efj.sh.in
# This file contains the types of files we'd like to extract from the jars
# when using the FileInitializer
Source19: %{name}-filenamepatterns.txt
-# cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer
-# tar cjf eclipse-fileinitializerapp.tar.bz2 equinox-incubator/
-# (generated 2006-11-01 18:48 UTC)
-Source20: %{name}-fileinitializerapp.tar.bz2
# Script to wrap PDE Build calls for bundle builds
Source21: %{name}-pdebuild.sh
# config.ini to run the director for provisioning the installation
@@ -631,8 +627,6 @@ if [ ! -z "$JARS" ]; then
#FIXME: enable exit 1
fi
-tar jxf %{SOURCE20}
-
# ECF filetransfer plugins
# TODO Enable with correct ecf
#tar jxf %{SOURCE25}
@@ -674,38 +668,14 @@ ORIGCLASSPATH=$CLASSPATH
export JAVA_HOME=%{java_home}
./build.sh
-# Build the FileInitializer application
SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
-mkdir -p home
-homedir=$(cd home && pwd)
LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src
-pushd equinox-incubator
-mkdir -p build
-
-# This can go away when package build handles plugins (not just features)
-echo "" > build/assemble.org.eclipse.equinox.initializer.all.xml
-echo "" > build/package.org.eclipse.equinox.initializer.all.xml
-
+pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
- -Duser.home=$homedir \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=plugin \
- -Did=org.eclipse.equinox.initializer \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-pushd build/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
- -Duser.home=$homedir \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-f build.xml build.update.jar
-popd
+cp org.eclipse.equinox.initializer*.jar $SDK/plugins
popd
#
@@ -755,7 +725,6 @@ popd
#rm build/rpmBuild/org.eclipse.test.zip
#zip -r build/rpmBuild/org.eclipse.test.zip eclipse
#popd
-popd
%install
rm -rf $RPM_BUILD_ROOT
@@ -800,10 +769,6 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-# Install the file initializer app
-cp -p build/eclipse-I20090611-1540-fetched-src/equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \
- $sdkDir/plugins
-
installDir=$sdkDir-Platform
metadataDir=$installDir/metadata-Platform
provisionDir=$installDir-provisioned
@@ -1487,6 +1452,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Aug 17 2009 Alexander Kurtakov 1:3.5.0-0.7
+- Use o.e.equinox.initializer from SOURCE1 instead of separate one.
+
* Fri Aug 14 2009 Alexander Kurtakov 1:3.5.0-0.6
- Do not use the provided eclipse.ini but the one from build.
diff --git a/sources b/sources
index 4ce2548..484fbb2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
-e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.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