Merge branch 'master' into cbi

Conflicts:
	eclipse.spec

1 files changed, 693 insertions, 169 deletions

diff --git a/eclipse.spec b/eclipse.spec
index 8b88ac1..cf3ae80 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -5,11 +5,11 @@ Epoch:  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   0
 %global initialize      1
-%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         8b7060063e10f73e00056a9766d33fc43f043f4b
+#%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
+#%global eb_sha1         8b7060063e10f73e00056a9766d33fc43f043f4b
 %global build_id        I20120608-1400
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
-%global emf_version     2.8.0
+%global installation_loc %{_libdir}/%{name}
 
 # FIXME:  update java packaging guidelines for this.  See
 # fedora-devel-java-list discussion in September 2008.
@@ -20,12 +20,14 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-%{eb_sha1}.tar.xz
-Source1:        %{download_url}eclipse-%{eclipse_version}-%{build_id}-src.tar.bz2
+Source0:        eclipse-source.tar.bz2
+Source1:        eclipse-jdtpdeupdatesite.tar.bz2
+Source2:        eclipse.desktop
+Source3:        efj.sh
 Source4:        macros.%{name}
 Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom
 # Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
@@ -33,7 +35,68 @@ Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/
 Source6:        org.eclipse.osgi.services-3.2.100.v20100503.pom
 Source7:        http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
 Source8:        org.eclipse.jdt.core-3.8.0.v_C03.pom
-Patch0:         lucene-3.6-compile.patch
+
+Source20:       rt.incubator.pom.xml
+Source21:       initializer.pom.xml
+
+Source30:       extract_patterns.txt
+Source31:       eclipse-copy-platform.sh
+Source32:       eclipse-pdebuild.sh
+
+
+
+
+# -com.sun.el
+# +javax.el
+# +org.apache.commons.el
+# -org.apache.commons.logging
+# +org.apache.commons.logging 
+# -org.apache.jasper.glassfish
+# +org.apache.tomcat
+# +org.apache.jasper
+# +org.apache.juli
+# -org.apache.lucene
+# -org.apache.lucene
+# +org.apache.lucene.core
+Patch0:         %{name}-help-feature-adjust-dependencies.patch
+
+
+# -org.w3c.dom.smil
+# -javax.annotation
+# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
+Patch1:         %{name}-remove-w3c-smil-and-use-geronimo.patch
+
+# 1.4 -> 1.6
+Patch2:         %{name}-set-1.6-bree.patch
+
+# com.ibm.icu.base -> com.ibm.icu
+Patch3:         %{name}-fix-icu-import.patch
+
+Patch4:         %{name}-no-source-for-dependencies.patch
+Patch5:         %{name}-osgi-serverside-patch-additional-imports.patch
+Patch6:         %{name}-fix-sshd-id.patch
+Patch7:         %{name}-fix-equinox-ip-imports.patch
+Patch8:         %{name}-remove-weaving.patch
+Patch9:         %{name}-fix-master-ecf.patch
+Patch10:        %{name}-fix-master-equinox.patch
+#services
+Patch11:        %{name}-osgi-unpack-sources.patch
+Patch12:        %{name}-fix-debug-ui.patch
+Patch13:        %{name}-fix-compatibility-class.patch
+
+Patch14:        %{name}-fix-pde-ui-compilation.patch
+Patch15:        %{name}-fix-transforms.patch
+
+Patch16:        %{name}-dont-download-old-platform-for-p2-tests.patch
+
+Patch17:        %{name}-do-not-run-as-root.patch
+Patch18:        %{name}-drop-user-profile-on-platform-change.patch
+Patch19:        %{name}-p2-pick-up-renamed-jars.patch
+Patch20:        %{name}-ignore-version-when-calculating-home.patch
+Patch21:        %{name}-populate-update-sites-from-master.patch
+Patch22:        %{name}-remove-jgit-provider.patch
+Patch23:         lucene-3.6-compile.patch
+Patch24:        %{name}-dont-unpack-junit.patch
 
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
@@ -48,13 +111,13 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
+BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  java-javadoc >= 1:1.7.0
 BuildRequires:  libXt-devel
 BuildRequires:  webkitgtk-devel
 BuildRequires:  geronimo-annotation >= 1.0-7
-
 BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
 BuildRequires: tomcat-lib >= 7.0.25-3
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
@@ -64,6 +127,7 @@ BuildRequires: jsch >= 0:0.1.46-2
 BuildRequires: apache-commons-el >= 1.0-22
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-codec >= 1.6-2
+BuildRequires: apache-sshd >= 0.7.0
 BuildRequires: jakarta-commons-httpclient >= 1:3.1-7
 BuildRequires: felix-gogo-command >= 0.12
 BuildRequires: felix-gogo-shell >= 0.10.0-3
@@ -79,6 +143,13 @@ BuildRequires: sac >= 1.3-12
 BuildRequires: batik  >= 1.8
 BuildRequires: xml-commons-apis >= 1.4.01-6
 BuildRequires: atinject >= 1-6
+BuildRequires: tycho >= 0.16
+BuildRequires: tycho-extras >= 0.16
+BuildRequires: eclipse-emf-core >= 1:2.8.0-13
+BuildRequires: eclipse-ecf-core
+BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: cglib
 
 %if 0%{?rhel} >= 6
 ExclusiveArch: %{ix86} x86_64
@@ -111,20 +182,6 @@ Requires:       jpackage-utils
 %description  equinox-osgi
 Eclipse OSGi - Equinox
 
-
-%package        rcp
-Version:        %{eclipse_version}
-Summary:        Eclipse Rich Client Platform
-Group:          Development/Languages
-Requires:       %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
-Requires:       %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
-Requires:       icu4j-eclipse >= 1:4.4.2.2-11
-Requires:       %{name}-emf-core >= %{epoch}:%{emf_version}-%{release}
-Provides:       osgi(system.bundle) = %{epoch}:%{eclipse_version}
-
-%description    rcp
-Eclipse Rich Client Platform
-
 %package        platform
 Version:        %{eclipse_version}
 Summary:        Eclipse platform common files
@@ -150,8 +207,14 @@ Requires: xml-commons-apis >= 1.4.01-6
 Requires: batik >= 1.8
 Requires: atinject >= 1-6
 Requires: geronimo-annotation >= 1.0-7
+Requires: eclipse-ecf-core
+Requires: eclipse-emf-core
+Requires: tomcat-servlet-3.0-api
 Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
+Obsoletes: eclipse-rcp < 1:%{eclipse_version}-%{release}
+Provides: eclipse-rcp = 1:%{eclipse_version}-%{release}
+Provides:       osgi(system.bundle) = %{epoch}:%{eclipse_version}
 
 %description    platform
 The Eclipse Platform is the base of all IDE plugins.  This does not include the
@@ -194,80 +257,587 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-export JAVA_HOME=%{java_home}
-%setup -q -n eclipse-build-%{eb_sha1}
-cp %{SOURCE1} .
-ant applyPatches
-%patch0
-pushd build/eclipse-%{eclipse_version}-%{build_id}-src
 
-sed -i -e "s|\[2.9.0,3.0.0)|\[2.9.0,4.0.0)|g" plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+ARCH=%{_arch}
+ARCH=${ARCH/i386/x86}
+
+%setup %{SOURCE0} -n R4_platform-aggregator
+
+pushd TMP
+tar xf %{SOURCE1}
+popd
+
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7
+%patch8
+%patch9
+%patch10
+%patch11
+%patch12
+%patch13
+%patch14
+%patch15
+%patch16
+%patch17
+%patch18
+%patch19
+%patch20
+%patch21
+%patch22
+%patch23
+%patch24
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
+%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
+%pom_disable_module bundles/org.eclipse.equinox.http.jetty6 rt.equinox.bundles .
+
+#we do not have dependencies for those tests
+%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
+%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
+%pom_disable_module features/master-equinox-weaving eclipse.platform.releng
+
+
+%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
+
+#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar.
+%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    -e "/osgi\.org/d" \
    -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
-    plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+    eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
 sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
-   -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
-   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+   -e "s/win32.win32.x86/gtk.linux.${ARCH}/" \
+   eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
 sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
    -e "/osgi\.org/d" \
-   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+   eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
 sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
-   -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
+   -e "s/motif.linux.x86/gtk.linux.${ARCH}/" \
    -e "/osgi\.org/d" \
-   plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-   plugins/org.eclipse.pde.doc.user/pdeOptions.txt
+   eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
+   eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
 sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
-   plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-   plugins/org.eclipse.pde.doc.user/pdeOptions.txt
+   eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
+   eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
 
 #fix for glib 2.31 not allowing include of anything else but glib
-sed -i -e "s|#include <glib/gslist.h>||g" plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
+sed -i -e "s|#include <glib/gslist.h>||g" eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
 
 # make sure there are no jars left
-JARS=""
-for j in $(find -name \*.jar); do
-  if [ ! -L $j ]; then
-    JARS="$JARS `echo $j`"
+find . -name *.jar -exec rm -f {} \;
+find . -name *.class -exec rm -f {} \;
+find . -name *.so -exec rm -f {} \;
+
+find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
+find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
+find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \;
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
+sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (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<String, ?>) (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<String, ?>) (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<String, ?>) (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<String,?>)(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<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
+
+sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
+sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ARCH}/pom.xml
+
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386503
+sed -i -e "s/3.6.0,4.0.0/3.0.0,4.0.0/" eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+
+
+sed -i -e "s/org.eclipse.sdk.epp/org.fedoraproject.eclipse.platform/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
+sed -i -e "s/<id>org.eclipse.sdk.epp<\/id>/<id>org.fedoraproject.eclipse.platform<\/id>/" TMP/org.eclipse.sdk.epp/pom.xml
+sed -i -e "s/<feature id=\"org.eclipse.sdk\"\/>/<feature id=\"org.eclipse.platform\"\/><feature id=\"org.eclipse.cvs\"\/>/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
+sed -i -e "s/\"org.eclipse.sdk.ide\"/\"org.eclipse.platform.ide\"/" TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product
+
+sed -i -e "s/<module>TMP\/org.eclipse.sdk.epp<\/module>/<module>TMP\/org.eclipse.sdk.epp<\/module><module>TMP\/jdtpde<\/module>/" pom.xml
+
+
+
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670
+cp %{SOURCE20} rt.equinox.incubator/pom.xml
+cp %{SOURCE21} rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/pom.xml
+sed -i -e "s/<module>rt.equinox.p2<\/module>/<module>rt.equinox.p2<\/module><module>rt.equinox.incubator<\/module>/" pom.xml
+
+
+sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml
+sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.ua/org.eclipse.help.base/pom.xml
+
+sed -i -e "s@ org.eclipse.egit.core;bundle-version=\"1.3.0\";resolution:=optional@ org.eclipse.ui@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF 
+sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF 
+#sed -i -e "s@ org.eclipse.ui.console,@ org.eclipse.ui.console@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF 
+
+rm eclipse.platform.releng/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/git/*
+
+%build
+ARCH=%{_arch}
+ARCH=${ARCH/i386/x86}
+
+mkdir -p repo
+cp -r /usr/share/java/emf repo
+eclipse  -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
+   -metadataRepository file:/`pwd`/repo \
+   -artifactRepository file:/`pwd`/repo \
+   -source `pwd`/repo/emf/eclipse \
+   -configs gtk.linux.${ARCH} \
+   -compress \
+   -publishArtifacts
+
+
+mvn-rpmbuild -f eclipse-parent/pom.xml \
+   clean install \
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
+
+mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
+   clean install \
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
+
+#workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
+#pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
+mvn-rpmbuild clean install \
+   -Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH}  \
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
+#popd
+
+mvn-rpmbuild clean install \
+   -Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH}  \
+   -Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
+
+pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}
+
+######################
+# Extract jdt and pde to dropins
+######################
+# do the initializer magic
+cp ../../../../../../../../rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/target/org.eclipse.equinox.initializer-1.0.0-SNAPSHOT.jar  eclipse/dropins
+pushd eclipse
+    ./eclipse -application org.eclipse.equinox.initializer.configInitializer -justThisArchOSWS -fileInitializer %{SOURCE30}
+    rm dropins/org.eclipse.equinox.initializer-1.0.0-SNAPSHOT.jar
+    ./eclipse -initialize
+# Create file listings for the extracted shared libraries
+echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+for id in `ls configuration/org.eclipse.osgi/bundles`; do
+  if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then
+    echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install;
+  else
+    echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
   fi
 done
-if [ ! -z "$JARS" ]; then
-    echo "These jars should be deleted and symlinked to system jars: $JARS"
-   #FIXME: enable  exit 1
-fi
+popd
 
+#make a backup 
+cp -rf eclipse eclipse-backup-with-jdt
+# go into backup
+pushd eclipse-backup-with-jdt
+        ./eclipse -application org.eclipse.equinox.p2.director \
+        -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
+        -installIU org.eclipse.jdt.feature.group
+#exit backup
 popd
 
-%build
-export JAVA_HOME=%{java_home}
-ant provision.cvs
+mkdir -p jdt/plugins jdt/features
 
-%install
-export JAVA_HOME=%{java_home}
-ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
 
+#get the difference and copy all files into jdt folder
+for i in `ls eclipse-backup-with-jdt/features` ; do \
+    if [ ! -e eclipse/features/$i ]; \
+        then cp -r eclipse-backup-with-jdt/features/$i jdt/features ; \
+    fi  \
+done
+
+for i in `ls eclipse-backup-with-jdt/plugins` ; do \
+    if [ ! -e eclipse/plugins/$i ]; \
+        then cp -r eclipse-backup-with-jdt/plugins/$i jdt/plugins ; \
+    fi  \
+done
+
+cp -rf eclipse-backup-with-jdt eclipse-backup-with-jdt-pde
+
+pushd eclipse-backup-with-jdt-pde
+    ./eclipse -application org.eclipse.equinox.p2.director \
+        -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
+        -installIU org.eclipse.sdk.feature.group
+popd
+
+mkdir -p sdk/plugins sdk/features
+
+#get the difference and copy all files into pde folder
+for i in `ls eclipse-backup-with-jdt-pde/features` ; do \
+    if [ ! -e eclipse-backup-with-jdt/features/$i ]; \
+        then cp -r eclipse-backup-with-jdt-pde/features/$i sdk/features ; \
+    fi  \
+done
+
+for i in `ls eclipse-backup-with-jdt-pde/plugins` ; do \
+    if [ ! -e eclipse-backup-with-jdt/plugins/$i ]; \
+        then cp -r eclipse-backup-with-jdt-pde/plugins/$i sdk/plugins ; \
+    fi  \
+done
+
+
+cp -r jdt sdk eclipse/dropins
+
+cd eclipse
+rm -rf configuration/org.eclipse.core.runtime
+rm -rf configuration/org.eclipse.equinox.app
+rm -rf configuration/org.eclipse.update/*
+
+find configuration -type d -name "data" -exec rm -rf `pwd`{} \;
+find configuration -type f -name "*.log" -exec rm `pwd`{} \;
+
+cd configuration/org.eclipse.osgi
+rm -rf .bundledata* .lazy* .manager .state*
+cd ../..
+
+pushd plugins
+#So, remove duplicated jars and symlink them
+f=`ls | grep -e "^com.ibm.icu_"`
+ rm $f 
+ ln -s %{_javadir}/icu4j-eclipse/plugins/com.ibm.icu_*.jar $f
+
+f=`ls | grep -e "^com.jcraft.jsch_"`
+ rm $f 
+ ln -s %{_javadir}/jsch.jar $f
+
+f=`ls | grep -e "^javax.el_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat-el-api.jar $f
+
+f=`ls | grep -e "^javax.inject_"`
+ rm $f 
+ ln -s %{_javadir}/atinject.jar $f
+
+f=`ls | grep -e "^javax.servlet_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat-servlet-api.jar $f
+
+f=`ls | grep -e "^javax.servlet.jsp_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat-jsp-api.jar $f
+
+f=`ls | grep -e "^javax.xml_"`
+ rm $f 
+ ln -s %{_javadir}/xml-commons-apis.jar $f
+
+f=`ls | grep -e "^org.apache.batik.css_"`
+ rm $f 
+ ln -s %{_javadir}/batik/batik-css.jar $f
+
+f=`ls | grep -e "^org.apache.batik.util_"`
+ rm $f 
+ ln -s %{_javadir}/batik/batik-util.jar $f
+
+f=`ls | grep -e "^org.apache.batik.util.gui_"`
+ rm $f 
+ ln -s %{_javadir}/batik/batik-gui-util.jar $f
+
+f=`ls | grep -e "^org.apache.commons.codec_"`
+ rm $f 
+ ln -s %{_javadir}/commons-codec.jar $f
+
+f=`ls | grep -e "^org.apache.commons.el_"`
+ rm $f 
+ ln -s %{_javadir}/commons-el.jar $f
+
+f=`ls | grep -e "^org.apache.commons.httpclient_"`
+ rm $f 
+ ln -s %{_javadir}/commons-httpclient.jar $f
+
+f=`ls | grep -e "^org.apache.commons.logging_"`
+ rm $f 
+ ln -s %{_javadir}/commons-logging.jar $f
+
+f=`ls | grep -e "^org.apache.el_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat/jasper-el.jar $f
+
+f=`ls | grep -e "^org.apache.felix.gogo.command_"`
+ rm $f 
+ ln -s %{_javadir}/felix/org.apache.felix.gogo.command.jar $f
+
+f=`ls | grep -e "^org.apache.felix.gogo.runtime_"`
+ rm $f 
+ ln -s %{_javadir}/felix/org.apache.felix.gogo.runtime.jar $f
+
+f=`ls | grep -e "^org.apache.felix.gogo.shell_"`
+ rm $f 
+ ln -s %{_javadir}/felix/org.apache.felix.gogo.shell.jar $f
+
+f=`ls | grep -e "^org.apache.geronimo.specs.geronimo-annotation_1.1_spec_"`
+ rm $f 
+ ln -s %{_javadir}/geronimo-annotation.jar $f
+
+f=`ls | grep -e "^org.apache.jasper_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat/jasper.jar $f
+
+f=`ls | grep -e "^org.apache.juli_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat/tomcat-juli.jar $f
+
+f=`ls | grep -e "^org.apache.lucene.core_"`
+ rm $f 
+ ln -s %{_javadir}/lucene.jar $f
+
+f=`ls | grep -e "^org.apache.lucene.analysis_"`
+ rm $f 
+ ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar $f
+
+f=`ls | grep -e "^org.apache.tomcat_"`
+ rm $f 
+ ln -s %{_javadir}/tomcat/tomcat-api.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.identity_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.identity_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.filetransfer_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.httpclient_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.httpclient.ssl_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer.ssl_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.provider.filetransfer_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.ecf.ssl_"`
+ rm $f 
+ ln -s %{_javadir}/ecf/eclipse/plugins/org.eclipse.ecf.ssl_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.emf.common_"`
+ rm $f 
+ ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.common_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.emf.ecore.change_"`
+ rm $f 
+ ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.emf.ecore_"`
+ rm $f 
+ ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.emf.ecore.xmi_"`
+ rm $f 
+ ln -s %{_javadir}/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.util_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-util.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.server_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-server.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.http_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-http.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.continuation_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-continuation.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.io_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-io.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.security_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-security.jar $f
+
+f=`ls | grep -e "^org.eclipse.jetty.servlet_"`
+ rm $f 
+ ln -s %{_javadir}/jetty/jetty-servlet.jar $f
+
+f=`ls | grep -e "^org.glassfish.web.javax.servlet.jsp_"`
+ rm $f 
+ ln -s %{_javadir}/glassfish-jsp.jar $f
+
+f=`ls | grep -e "^org.sat4j.core_"`
+ rm $f 
+ ln -s %{_javadir}/org.sat4j.core.jar $f
+
+f=`ls | grep -e "^org.sat4j.pb_"`
+ rm $f 
+ ln -s %{_javadir}/org.sat4j.pb.jar $f
+
+f=`ls | grep -e "^org.w3c.css.sac_"`
+ rm $f 
+ ln -s %{_javadir}/sac.jar $f
+
+f=`ls | grep -e "^org.w3c.dom.svg_"`
+ rm $f 
+ ln -s %{_javadir}/xml-commons-apis-ext.jar $f
+
+#also within ant
+cd org.apache.ant_*
+    pushd lib
+        rm *
+        ln -s %{_javadir}/ant/ant-antlr.jar
+        ln -s %{_javadir}/ant/ant-apache-bcel.jar
+        ln -s %{_javadir}/ant/ant-apache-bsf.jar
+        ln -s %{_javadir}/ant/ant-apache-log4j.jar
+        ln -s %{_javadir}/ant/ant-apache-oro.jar
+        ln -s %{_javadir}/ant/ant-apache-regexp.jar
+        ln -s %{_javadir}/ant/ant-apache-resolver.jar
+        ln -s %{_javadir}/ant/ant-apache-xalan2.jar
+        ln -s %{_javadir}/ant/ant-commons-logging.jar
+        ln -s %{_javadir}/ant/ant-commons-net.jar
+        ln -s %{_javadir}/ant/ant-javamail.jar
+        ln -s %{_javadir}/ant/ant-jdepend.jar
+        ln -s %{_javadir}/ant/ant-jmf.jar
+        ln -s %{_javadir}/ant/ant-jsch.jar
+        ln -s %{_javadir}/ant/ant-junit.jar
+        ln -s %{_javadir}/ant/ant-junit.jar junit4.jar
+        ln -s %{_javadir}/ant-launcher.jar
+        ln -s %{_javadir}/ant/ant-swing.jar
+        ln -s %{_javadir}/ant/ant-testutil.jar
+        ln -s %{_javadir}/ant.jar
+    popd
+
+    pushd bin
+        rm *
+        ln -s /usr/bin/ant ant
+        ln -s /usr/bin/antRun antRun
+        ln -s /usr/bin/antRun.pl antRun.pl
+        ln -s /usr/bin/runant.pl runant.pl
+        ln -s /usr/bin/runant.py runant.py
+        ln -s /usr/bin/complete-ant-cmd.pl complete-and-cmd.pl
+    popd
+popd
+
+pushd dropins/jdt/plugins
+ f=`ls | grep -e "^org.hamcrest.core_"`
+ rm $f 
+ ln -s %{_javadir}/hamcrest/core.jar $f
+
+ cd org.junit_3.8.2.*
+ rm junit.jar
+ ln -s /usr/share/java/junit.jar
+ cd ..
+popd
+
+pushd dropins/sdk/plugins
+ f=`ls | grep -e "^com.ibm.icu.source_*"`
+ rm $f 
+ ln -s %{_javadir}/icu4j-eclipse/plugins/com.ibm.icu.source_*.jar $f
+
+ f=`ls | grep -e "^org.objectweb.asm_*"`
+ rm $f 
+ ln -s %{_javadir}/objectweb-asm/asm-all.jar $f
+popd
+
+popd
+
+%install
+ARCH=%{_arch}
+ARCH=${ARCH/i386/x86}
 # We don't need icon.xpm
 # https://bugs.eclipse.org/292472
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
 
+#install icons
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/eclipse.png
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/eclipse.png
+install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/eclipse.png
+mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \
+    $RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png
+
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT/usr/share/eclipse/dropins
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 
+#################################
+### Extraced from old build.xml #
+#################################
+LOCAL_PWD=`pwd`
+#change the installation p2 files
+pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/
+for i in `ls | grep "profile.gz"` ; do  \
+		echo $i ; \
+		gunzip $i ; \
+		sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse@%{_libdir}/eclipse@g" *.profile ; \
+		gzip *.profile ; \
+	done 
+
+#    TODO: some other paths
+popd
+
+#installation itself - copy it into right location
+rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse \
+    $RPM_BUILD_ROOT%{_libdir}
+
+#desktop file
+install -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop
+
+#eclipse compiler
+chmod ugo+rx %{SOURCE3}
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+install %{SOURCE3} $RPM_BUILD_ROOT/usr/bin/efj
+TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/plugins | grep launcher_[0-9]*`
+sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT/usr/bin/efj
+
+#eclipse binary
+mkdir -p $RPM_BUILD_ROOT/usr/bin/
+pushd $RPM_BUILD_ROOT/usr/bin/
+    ln -s %{_libdir}/%{name}/eclipse
+popd 
+
+pushd $RPM_BUILD_ROOT/%{_libdir}/%{name}
+SWT_JAR=`ls $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins | grep swt.gtk`
+    ln -s  %{_libdir}/%{name}/plugins/${SWT_JAR} swt.jar
+    ln -s  %{_libdir}/%{name}/plugins/${SWT_JAR} swt-gtk.jar
+popd
+
+#eclipse ini
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
+pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
+ln -s %{_libdir}/%{name}/eclipse.ini
+popd
+#################################
+### End of extraction           #
+#################################
+
+
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-# Create file listings for the extracted shared libraries
-echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
-for id in `ls configuration/org.eclipse.osgi/bundles`; do
-  if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then
-    echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install;
-  else
-    echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
-  fi
-done
+
+rm icon.xpm
+
 popd
 
 # Remove state files
@@ -283,20 +853,22 @@ done
 popd
 
 # Temporary fix until https://bugs.eclipse.org/294877 is resolved
-sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
 
 # Prevent running master Eclipse in a shared configuration
-echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
+
+echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini
 
 # Deploy installation debug config
 echo -e "org.eclipse.equinox.p2.core/debug=true" >  $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
@@ -340,16 +912,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
-cp -p pdebuild/eclipse-copy-platform.sh copy-platform
+cp -p %{SOURCE31} copy-platform
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
 mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
 copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
 
 # Install the PDE Build wrapper script.
-install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
+install -p -D -m0755 %{SOURCE32} \
   $RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
-PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
+PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/pde/plugins \
   | grep org.eclipse.pde.build_ | \
   sed 's/org.eclipse.pde.build_//')
 sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
@@ -359,26 +931,6 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
-# Remove the junit library duplicated by pdebuild.
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_4.10.0.v4_10_0_v20120426-0900.jar
-
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.common_*
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/features/org.eclipse.emf.ecore_*
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.common_*.jar
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.change_*.jar
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore.xmi_*.jar
-rm -rf   $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.emf.ecore_*.jar
-
-pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/features/
-popd
-
-pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/
-	ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.common_2.8.0.v20110913-1526.jar org.eclipse.emf.common_2.8.0.R2_8_0.jar
-	ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore_2.8.0.R2_8_0.jar
-	ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.change_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.change_2.8.0.R2_8_0.jar,4,false
-	ln -s /usr/share/java/emf/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.8.0.v20110913-1526.jar org.eclipse.emf.ecore.xmi_2.8.0.R2_8_0.jar,4,false
-popd
-
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -418,71 +970,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/swt.jar
 %{_libdir}/java/swt.jar
 
-%files rcp
-%dir %{_libdir}/%{name}/features
-%dir %{_datadir}/%{name}
-%dir %{_libdir}/%{name}/configuration
-%{_libdir}/%{name}/configuration/config.ini
-%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-%dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
-%{_libdir}/%{name}/readme
-%{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
-%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar
-%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar
-%{_libdir}/%{name}/plugins/org.apache.batik.css_*
-%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
-%{_libdir}/%{name}/plugins/org.apache.batik.util_*
-%{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.help_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
-%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
-%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
-
 %if %{initialize}
 %files platform -f %{name}-platform.install
 %else
@@ -499,15 +986,21 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/eclipse
 %dir %{_libdir}/%{name}/dropins
 %dir %{_datadir}/%{name}/dropins
+%{_libdir}/%{name}/configuration/config.ini
+%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %{_libdir}/%{name}/features/org.eclipse.platform_*
 %{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
+%{_libdir}/%{name}/features/org.eclipse.rcp_*
+%{_libdir}/%{name}/features/org.eclipse.emf.common_*
+%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
+%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*
 %{_libdir}/%{name}/plugins/javax.servlet_*
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
 %{_libdir}/%{name}/plugins/javax.el_*
-%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar
-%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar
+%{_libdir}/%{name}/plugins/javax.inject_*.jar
+%{_libdir}/%{name}/plugins/javax.xml_1.3.4.*.jar
 %{_libdir}/%{name}/plugins/org.apache.tomcat_*
 %{_libdir}/%{name}/plugins/org.apache.juli_*
 %{_libdir}/%{name}/plugins/org.apache.el_*
@@ -523,6 +1016,7 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.apache.felix.gogo.runtime_*
 %{_libdir}/%{name}/plugins/org.apache.felix.gogo.shell_*
 %{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
+%{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.core_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
@@ -540,6 +1034,10 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
@@ -604,7 +1102,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.io_*
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.security_*
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.initializer_*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.cvs_*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
@@ -661,10 +1158,34 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.sat4j.pb_*
 %{_libdir}/%{name}/plugins/org.w3c.css.sac_*
 %{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
+%{_libdir}/%{name}/plugins/org.eclipse.help_*
+%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
+%{_libdir}/%{name}/plugins/org.eclipse.jface_*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp_*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
+%{_libdir}/%{name}/plugins/org.eclipse.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
+%{_libdir}/%{name}/readme/readme_eclipse.html
 # Put this in -platform since we're putting the p2 stuff here
 %{_libdir}/%{name}/artifacts.xml
 # FIXME: should we ship content.xml for the platform?
@@ -698,6 +1219,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Tue Aug 21 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-9
+- Adopt upstream CBI system.
+
 * Tue Aug 14 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-8
 - Symlink emf bundles.