diff --git a/.gitignore b/.gitignore
index 902ae01..186de50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
/.project
eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
+/R4_platform-aggregator
+/eclipse-source.tar.bz2
+/eclipse-jdtpdeupdatesite.tar.bz2
diff --git a/eclipse-copy-platform.sh b/eclipse-copy-platform.sh
new file mode 100755
index 0000000..60c8b45
--- /dev/null
+++ b/eclipse-copy-platform.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+
+# We need to make our own copy of the eclipse platform in order to
+# build against it. We do this since the build root might already
+# contain a copy of the plugin we are building -- and the eclipse
+# releng scripts fail in this situation. We put this script in the
+# eclipse core so that it is easy to use from other spec files.
+
+# Arguments are:
+# * directory where results should end up (script will make it)
+# * base location of eclipse platform install
+# * an optional string that is used to select non-platform
+# plugins and features. At present if a plugin or feature has
+# this as a substring, it will be included. You need only run
+# this script once, it will link both the platform and the other
+# optionally-selected parts in a single invocation.
+
+# Test to see if the minimum arguments
+# are specified
+
+if [ $# -lt 2 ]; then
+ echo "Usage: copy-platform where eclipse_base optional_directories"
+ echo "For example: copy-plaform ~/SDK /usr/lib/eclipse cdt pydev jdt"
+ exit 1
+fi
+
+where=$1; shift
+eclipse=$1; shift
+
+datadir=/usr/share/eclipse
+
+mkdir -p $where/plugins $where/features
+cd $where
+
+# Are there any optional arguments left?
+if [ $# -gt 0 ]; then
+ for optional in "$@"; do
+ (cd $eclipse;
+ ls -d plugins/*"$optional"* features/*"$optional"* 2>/dev/null) |
+ while read f; do
+ [ ! -e $f ] && ln -s $eclipse/$f $f
+ done
+ (cd $eclipse/dropins; ls -d "$optional" 2>/dev/null) |
+ while read f; do
+ if [ -e $eclipse/dropins/$f/eclipse ]; then
+ (cd $eclipse/dropins/$f/eclipse;
+ ls -d plugins/* features/* 2>/dev/null) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $eclipse/dropins/$f/eclipse/$g $g
+ done
+ else
+ (cd $eclipse/dropins/$f;
+ ls -d plugins/* features/* 2>/dev/null) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $eclipse/dropins/$f/$g $g
+ done
+ fi
+ done
+ (cd $datadir/dropins; ls -d "$optional" 2>/dev/null) |
+ while read f; do
+ if [ -e $datadir/dropins/$f/eclipse ]; then
+ (cd $datadir/dropins/$f/eclipse;
+ ls -d plugins/* features/* 2>/dev/null) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $datadir/dropins/$f/eclipse/$g $g
+ done
+ else
+ (cd $datadir/dropins/$f;
+ ls -d plugins/* features/* 2>/dev/null) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $datadir/dropins/$g $g
+ done
+ fi
+ done
+ done
+fi
+for p in $(ls -d $eclipse/dropins/jdt/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/jdt/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/jdt/features/*); do
+ feature=$(basename $f)
+ [ ! -e features/$feature ] && ln -s $eclipse/dropins/jdt/features/$feature features/$feature
+done
+for p in $(ls -d $eclipse/dropins/sdk/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/sdk/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/sdk/features/*); do
+ feature=$(basename $f)
+ [ ! -e features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature features/$feature
+done
+for p in $(ls -d $eclipse/plugins/*); do
+ plugin=$(basename $p)
+ [ ! -e plugins/$plugin ] && ln -s $eclipse/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/features/*); do
+ feature=$(basename $f)
+ [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature
+done
diff --git a/eclipse-do-not-run-as-root.patch b/eclipse-do-not-run-as-root.patch
new file mode 100644
index 0000000..e1be89d
--- /dev/null
+++ b/eclipse-do-not-run-as-root.patch
@@ -0,0 +1,45 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-05 14:41:12.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2012-05-18 15:28:28.553493782 +0200
+@@ -8,7 +8,7 @@
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Anton Leherbauer (Wind River Systems) - bug 301226
+- * Red Hat Inc. - bug 373640
++ * Red Hat Inc. - bug 373640, 379102
+ *******************************************************************************/
+ package org.eclipse.equinox.launcher;
+
+@@ -235,6 +235,9 @@
+ protected BufferedWriter log = null;
+ protected boolean newSession = true;
+
++ private boolean forbiddenMasterEclipse;
++ private static final String FORBIDDEN_MASTER_ECLIPSE = "-preventMasterEclipseLaunch";
++
+ // for variable substitution
+ public static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$
+ public static final char VARIABLE_DELIM_CHAR = '$';
+@@ -555,6 +558,12 @@
+ setupVMProperties();
+ processConfiguration();
+
++if (forbiddenMasterEclipse && System.getProperty(PROP_SHARED_CONFIG_AREA) == null) { //$NON-NLS-1$
++ System.err.println("This application should not be run by the owner of the shared configuration.");
++ System.setProperty(PROP_EXITCODE, "" + 14); //$NON-NLS-1$
++ return;
++ }
++
+ // need to ensure that getInstallLocation is called at least once to initialize the value.
+ // Do this AFTER processing the configuration to allow the configuration to set
+ // the install location.
+@@ -1532,6 +1541,10 @@
+ // passed thru this arg (i.e., do not set found = true)
+ continue;
+ }
++ if (args[i].equalsIgnoreCase(FORBIDDEN_MASTER_ECLIPSE)) {
++ forbiddenMasterEclipse = true;
++ found = true;
++ }
+
+ // check if development mode should be enabled for the entire platform
+ // If this is the last arg or there is a following arg (i.e., arg+1 has a leading -),
diff --git a/eclipse-dont-download-old-platform-for-p2-tests.patch b/eclipse-dont-download-old-platform-for-p2-tests.patch
new file mode 100644
index 0000000..0db1404
--- /dev/null
+++ b/eclipse-dont-download-old-platform-for-p2-tests.patch
@@ -0,0 +1,20 @@
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml.bak 2012-08-02 10:43:30.000000000 +0200
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml 2012-08-02 11:02:02.009984238 +0200
+@@ -34,7 +34,7 @@
+
+
+
+-
++
+
+
+
diff --git a/eclipse-dont-unpack-junit.patch b/eclipse-dont-unpack-junit.patch
new file mode 100644
index 0000000..a26a9e5
--- /dev/null
+++ b/eclipse-dont-unpack-junit.patch
@@ -0,0 +1,12 @@
+--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.bak 2012-07-25 17:15:55.000000000 +0200
++++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2012-08-21 12:15:36.078700808 +0200
+@@ -155,7 +155,8 @@
+ id="org.junit"
+ download-size="0"
+ install-size="0"
+- version="4.10.0.qualifier"/>
++ version="4.10.0.qualifier"
++ unpack="false"/>
+
+ org.eclipse.core.runtime.compatibility.registry
+ 3.5.100-SNAPSHOT
+ eclipse-plugin
++
++
++
++
++ maven-antrun-plugin
++ 1.7
++
++
++ natives
++ process-resources
++
++
++
++
++
++
++ run
++
++
++
++
++
++ bsf
++ bsf
++ 2.4.0
++
++
++ rhino
++ js
++ 1.7R2
++
++
++ org.apache.ant
++ ant-apache-bsf
++ 1.8.3
++
++
++ org.apache.ant
++ ant-nodeps
++ 1.8.1
++
++
++
++
++
+
diff --git a/eclipse-fix-debug-ui.patch b/eclipse-fix-debug-ui.patch
new file mode 100644
index 0000000..02d9ba4
--- /dev/null
+++ b/eclipse-fix-debug-ui.patch
@@ -0,0 +1,22 @@
+--- eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java.bak 2012-07-30 14:27:39.000000000 +0200
++++ eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java 2012-07-30 14:28:00.277726901 +0200
+@@ -182,7 +182,7 @@
+ }
+ int cmp;
+ if (num1 instanceof Long && num2 instanceof Long) {
+- cmp = ((Long)num1).compareTo(num2);
++ cmp = ((Long)num1).compareTo((Long)num2);
+ } else {
+ cmp = Double.compare(num1.doubleValue(), num2.doubleValue());
+ }
+--- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak 2012-07-25 17:26:39.000000000 +0200
++++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java 2012-07-30 15:09:46.416687878 +0200
+@@ -853,7 +853,7 @@
+ */
+ private boolean isEnabled(Object element) {
+ if (element instanceof ICommand) {
+- Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED);
++ Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED);
+ if (enabled != null) {
+ return enabled.booleanValue();
+ }
diff --git a/eclipse-fix-equinox-ip-imports.patch b/eclipse-fix-equinox-ip-imports.patch
new file mode 100644
index 0000000..559e61a
--- /dev/null
+++ b/eclipse-fix-equinox-ip-imports.patch
@@ -0,0 +1,17 @@
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF 2012-07-27 12:30:04.415050626 +0200
+@@ -9,8 +9,6 @@
+ Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent
+ DynamicImport-Package: org.osgi.service.permissionadmin; version="1.0"
+ Import-Package:
+- javax.servlet;version="2.1",
+- javax.servlet.http;version="2.1",
+ org.eclipse.equinox.internal.util.ref;version="1.0",
+ org.eclipse.equinox.internal.util.timer;version="1.0",
+ org.osgi.framework;version="1.0",
+@@ -39,4 +37,5 @@
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.3
+ Bundle-Localization: plugin
++Require-Bundle: javax.servlet;bundle-version="3.0.0"
+
diff --git a/eclipse-fix-icu-import.patch b/eclipse-fix-icu-import.patch
new file mode 100644
index 0000000..7114062
--- /dev/null
+++ b/eclipse-fix-icu-import.patch
@@ -0,0 +1,29 @@
+--- eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml.bak 2012-07-25 17:20:02.000000000 +0200
++++ eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml 2012-07-26 13:33:46.421478882 +0200
+@@ -19,7 +19,7 @@
+
+
+
+
+
+-
+-
+
+-
+-
+-
+-
+
+
+
+-
+-
+
+-
+-
+-
++
+
+-
+-
+-
++
+
+
+
+
+
+-
++
+
+-
+-
+-
+-
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
+
diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch
new file mode 100644
index 0000000..2e7feab
--- /dev/null
+++ b/eclipse-fix-master-equinox.patch
@@ -0,0 +1,235 @@
+--- eclipse.platform.releng/features/master-equinox/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-07-27 14:02:59.042494959 +0200
+@@ -7,173 +7,153 @@
+
+-
+-
++
++
++
++
+-
+-
++
++
+-
+-
++
++
+-
+-
++
++
+-
+-
+-
+-
+-
+-
+-
+-
++
++
+-
+-
++
++
+-
+-
++
++
+-
+-
++
++
+-
+-
++
++
+-
+-
+
+-
+
+-
+
+-
+-
+-
+-
++ unpack="false"/>
++
+
+-
+-
++
++
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+-
+-
+-
+-
+
diff --git a/eclipse-fix-pde-ui-compilation.patch b/eclipse-fix-pde-ui-compilation.patch
new file mode 100644
index 0000000..a769d33
--- /dev/null
+++ b/eclipse-fix-pde-ui-compilation.patch
@@ -0,0 +1,29 @@
+--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java.bak 2012-07-31 08:21:34.334028987 +0200
++++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java 2012-07-31 08:22:14.211252316 +0200
+@@ -142,7 +142,7 @@
+ private String[] resolveRootErrors(ResolverError[] errors) {
+ TreeSet collector = new TreeSet(new Comparator() {
+ public int compare(Object o1, Object o2) {
+- return ((String)o1).compareTo(o2);
++ return ((String)o1).compareTo((String)o2);
+ }
+ });
+ ResolverError error = null;
+@@ -179,4 +179,4 @@
+ }
+ return SearchMessages.SkippedComponent_component_was_excluded;
+ }
+-}
+\ No newline at end of file
++}
+--- eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java.bak 2012-07-31 08:38:47.168724521 +0200
++++ eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java 2012-07-31 08:40:15.781250931 +0200
+@@ -128,7 +128,7 @@
+ properties.put("osgi.os", os);
+ properties.put("osgi.ws", ws);
+ properties.put("osgi.arch", arch);
+- assertTrue(FrameworkUtil.createFilter(filter).match(properties));
++ //assertTrue(FrameworkUtil.createFilter(filter).match(properties));
+ }
+
+ // test that '<' and '>' are properly escaped in generated source feature
diff --git a/eclipse-fix-sshd-id.patch b/eclipse-fix-sshd-id.patch
new file mode 100644
index 0000000..ebb6238
--- /dev/null
+++ b/eclipse-fix-sshd-id.patch
@@ -0,0 +1,16 @@
+--- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak 2012-07-26 16:40:00.000000000 +0200
++++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF 2012-07-26 16:40:17.896441807 +0200
+@@ -5,4 +5,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
++Fragment-Host: org.apache.sshd.core
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF 2012-07-27 09:17:27.641681636 +0200
+@@ -7,4 +7,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
++Fragment-Host: org.apache.sshd.core
diff --git a/eclipse-fix-transforms.patch b/eclipse-fix-transforms.patch
new file mode 100644
index 0000000..42f798c
--- /dev/null
+++ b/eclipse-fix-transforms.patch
@@ -0,0 +1,11 @@
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java.bak 2012-07-31 08:57:28.993158697 +0200
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java 2012-07-31 09:00:15.187466997 +0200
+@@ -32,7 +32,7 @@
+ properties.put("equinox.transformerType", "xslt"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ Object transformer = new XSLTStreamTransformer(logTracker);
+- registration = context.registerService(Object.class.getName(), transformer, properties);
++ registration = context.registerService(Object.class.getName(), transformer, (java.util.Dictionary)(Object)properties);
+
+ }
+
diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch
new file mode 100644
index 0000000..59a82f7
--- /dev/null
+++ b/eclipse-help-feature-adjust-dependencies.patch
@@ -0,0 +1,116 @@
+diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml
+--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400
++++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400
+@@ -34,30 +34,37 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
+-
+
+-
+
+-
++
++
+
+
++
++
++
++
+
+
+diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META
+--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java.old 2012-01-18 08:58:41.397436636 +0100
++++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java 2012-01-18 08:59:35.994625494 +0100
+@@ -106,7 +106,7 @@
+
+ public static final String DEPENDENCIES_KEY_ANALYZER = "analyzer"; //$NON-NLS-1$
+
+- private static final String LUCENE_BUNDLE_ID = "org.apache.lucene"; //$NON-NLS-1$
++ private static final String LUCENE_BUNDLE_ID = "org.apache.lucene.core"; //$NON-NLS-1$
+
+ private static final String FIELD_NAME = "name"; //$NON-NLS-1$
+
+--- eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF.orig 2012-04-06 08:28:49.000000000 +0200
++++ eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF 2012-04-06 08:40:46.988519392 +0200
+@@ -39,8 +39,8 @@
+ org.eclipse.help.search,
+ org.eclipse.help.server,
+ org.eclipse.help.standalone
+-Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport,
+- org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport,
++Require-Bundle: org.apache.lucene.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
++ org.apache.lucene.analysis;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+--- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak 2012-07-25 17:39:10.000000000 +0200
++++ eclipse.platform.ua/org.eclipse.help.base/pom.xml 2012-07-26 14:34:22.971863419 +0200
+@@ -33,7 +33,7 @@
+
+
+ eclipse-plugin
+- org.apache.lucene
++ org.apache.lucene.core
+ [2.9,3.0)
+
+
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-27 14:39:44.824536490 +0200
+@@ -37,7 +37,7 @@
+
+
+ eclipse-plugin
+- org.apache.lucene
++ org.apache.lucene.core
+ [2.9,3.0)
+
+
diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch
new file mode 100644
index 0000000..f60f47c
--- /dev/null
+++ b/eclipse-ignore-version-when-calculating-home.patch
@@ -0,0 +1,11 @@
+--- rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java.orig 2012-05-05 14:40:27.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java 2012-05-18 09:18:35.819051000 +0200
+@@ -317,7 +317,7 @@
+ String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
+ if (appVersion == null || appVersion.trim().length() == 0)
+ appVersion = ""; //$NON-NLS-1$
+- appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
+ } catch (IOException e) {
+ // Do nothing if we get an exception. We will default to a standard location
+ // in the user's home dir.
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
new file mode 100644
index 0000000..e95b9ed
--- /dev/null
+++ b/eclipse-no-source-for-dependencies.patch
@@ -0,0 +1,529 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig 2012-03-27 16:28:35.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties 2012-03-30 09:03:43.205386499 +0200
+@@ -31,6 +31,4 @@
+ plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
+ plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+ plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
+- plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+- plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
+- plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
+\ No newline at end of file
++ plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
+\ No newline at end of file
+--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig 2012-04-06 11:35:38.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties 2012-04-06 13:02:22.997174313 +0200
+@@ -11,33 +11,12 @@
+ bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
+
+ generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
+- plugin@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\
+- plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
+ exclude@org.eclipse.platform.doc.user
+
+ generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
+-plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\
+-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
+-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
+ exclude@org.eclipse.jdt.doc.user
+ generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
+ generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
+-generate.feature@org.eclipse.help.source=org.eclipse.help,\
+- plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
+- plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
+- plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
+- plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
+- plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
+- plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
+- plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
+- plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\
+- plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
++generate.feature@org.eclipse.help.source=org.eclipse.help
+
+ generatedVersionLength=45
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak 2012-07-25 17:45:43.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml 2012-07-26 15:53:52.708568166 +0200
+@@ -31,13 +31,6 @@
+ unpack="false"/>
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+-
+-
+
+
+-
+-
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+
+
+-
+-
+-
+-
+
+
+
+
+-
+-
+-
+-
+-
+-
+
+
+-
+
+
+-
+-
++ unpack="false"/>
+
+
+-
+-
++ unpack="false"/>
+
+
+
+
+-
+-
+
+
+
+
+-
+-
+-
+
+-
+-
+-
+
+
+-
+-
+
+-
+-
+
+
+-
+
+
+
+
++
++
++
++
++
++
+
+
+
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
+@@ -42,6 +42,17 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-31 07:43:57.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-31 08:05:24.279277920 +0200
+@@ -59,6 +59,17 @@
+
+ source-feature
+
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2012-08-10 09:56:55.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2012-08-10 10:09:14.758180621 +0200
+@@ -59,6 +59,8 @@
+
+
+
++
++
+
+
+
+--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.bak 2012-08-10 10:11:03.000000000 +0200
++++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2012-08-10 10:21:52.409764968 +0200
+@@ -40,6 +40,8 @@
+
+
+
++
++
+
+
+
+--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2012-08-10 10:23:32.000000000 +0200
++++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2012-08-10 10:36:43.211016068 +0200
+@@ -39,6 +39,7 @@
+
+
+
++
+
+
+
diff --git a/eclipse-osgi-serverside-patch-additional-imports.patch b/eclipse-osgi-serverside-patch-additional-imports.patch
new file mode 100644
index 0000000..20dfe6a
--- /dev/null
+++ b/eclipse-osgi-serverside-patch-additional-imports.patch
@@ -0,0 +1,25 @@
+--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.old 2012-01-14 12:38:46.714594091 +0100
++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml 2012-01-14 12:39:04.959639056 +0100
+@@ -152,6 +152,21 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
++
++
++
++
++
+
+
+
+
+
++
++ org.eclipse.tycho
++ target-platform-configuration
++
++
++
++
++ eclipse-plugin
++ javax.servlet
++ 0.0.0
++
++
++
++
++
++
++
++ maven-antrun-plugin
++ 1.7
++
++
++ extract-sources
++ process-resources
++
++
++
++
++
++
++
++
++
++ run
++
++
++
++ copy-classes-back
++ process-classes
++
++
++
++
++
++
++
++ run
++
++
++
++
++
++ bsf
++ bsf
++ 2.4.0
++
++
++ rhino
++ js
++ 1.7R2
++
++
++ org.apache.ant
++ ant-apache-bsf
++ 1.8.3
++
++
++ org.apache.ant
++ ant-nodeps
++ 1.8.1
++
++
++
+
+
+
+--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak 2012-08-01 16:03:39.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties 2012-08-01 16:22:16.274724843 +0200
+@@ -11,13 +11,16 @@
+ bin.includes = plugin.properties,\
+ about.html,\
+ META-INF/,\
+- org/,\
++ org/,\
+ about_files/
+ src.includes = src.zip,\
+ about.html,\
+ about_files/
+-source.. = .
+-output.. = .
++source.. = src/
++output.. = bin/
+ customBuildCallbacks=customBuildCallbacks.xml
+ javacSource = 1.5
+ javacTarget = 1.5
++jars.compile.order = library.jar,\
++ src/
++source.library.jar = src2/
diff --git a/eclipse-p2-pick-up-renamed-jars.patch b/eclipse-p2-pick-up-renamed-jars.patch
new file mode 100644
index 0000000..8a85fe3
--- /dev/null
+++ b/eclipse-p2-pick-up-renamed-jars.patch
@@ -0,0 +1,11 @@
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig 2012-05-05 15:24:03.000000000 +0200
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java 2012-05-17 16:14:48.607827015 +0200
+@@ -752,7 +752,7 @@
+ //First check to see if there is already an IU around for this
+ IInstallableUnit bundleIU = queryForIU(result, bundleDescriptions[i].getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
+ IArtifactKey key = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
+- if (bundleIU == null) {
++ if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
+ createAdviceFileAdvice(bundleDescriptions[i], info);
+ // Create the bundle IU according to any shape advice we have
+ bundleIU = doCreateBundleIU(bd, key, info);
diff --git a/eclipse-pdebuild.sh b/eclipse-pdebuild.sh
new file mode 100755
index 0000000..ea14c58
--- /dev/null
+++ b/eclipse-pdebuild.sh
@@ -0,0 +1,314 @@
+#!/bin/bash
+
+# args: [-f ] [-d ] [-a ] [-j ] [-v] [-D] [-o ]
+
+function usage {
+cat << _EOF_
+usage: $0 []
+
+Use PDE Build to build Eclipse features
+
+Optional arguments:
+ -h Show this help message
+ -f Feature ID to build
+ -d Plugin dependencies in addition to Eclipse SDK
+ (space-separated, names on which to glob features and plugins)
+ -a Additional build arguments (ex. -DjavacSource=1.5)
+ -j VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar)
+ -v Be verbose
+ -D Debug platform itself (passes -consolelog -debug to Eclipse)
+ -o Directory containing Orbit-style dependencies
+ -z Comma-delimited list of dependency zips (not for use during RPM build)
+_EOF_
+}
+
+function copyPlatform {
+ # This seems silly but I was running into issues with empty strings
+ # counting as arguments to copy-platform -- overholt, 2008-03
+ if [ -z "$dependencies" ]; then
+ if [ $verbose -eq 1 ]; then
+ echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+ /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
+ else
+ echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+ /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
+ fi
+ else
+ if [ $verbose -eq 1 ]; then
+ echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+ /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
+ else
+ echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+ /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
+ fi
+ fi
+}
+
+function findFeatureId {
+ # We can determine the feature ID if we have only one
+ numFeatures=$(find $sourceDir -name feature.xml | wc -l)
+ if [ $numFeatures -ne 1 ]; then
+ #echo "# features found = $numFeatures"
+ echo "Cannot determine feature ID. Please specify with -f."
+ usage
+ exit 1
+ fi
+
+ featureXml=$(find $sourceDir -name feature.xml)
+
+ # Taken from Ben Konrath's package-build
+ # make an ant build files to extract the id from the feature.xml
+ buildFile=$buildDir/findFeatureForRPM-tmp-build.xml
+
+ echo "
+
+
+
+
+
+ " > $buildFile
+
+ featureId=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ rm $buildFile
+}
+
+function findFeatureNameAndVersion {
+ featureXml=$(find $sourceDir -name feature.xml | while read f; do grep -l id=\"$featureId\" $f; done)
+
+ buildFile=$buildDir/findFeatureForRPM-tmp-build.xml
+
+ echo "
+
+
+
+
+
+ " > $buildFile
+
+ featureName=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
+ rm $buildFile
+
+ echo "
+
+
+
+
+
+ " > $buildFile
+
+ featureVersion=$(ant -Dbasedir=$sourceDir -f $buildFile 2>&1 | grep echo | sed "s/.*\[echo\]\ //")
+ rm $buildFile
+}
+
+function findMaxBREE {
+ manifests=$(find $sourceDir -name MANIFEST.MF)
+ maxBree=1.4
+ for i in $manifests; do
+ breeLine=$(cat $i|grep RequiredExecutionEnvironment|cut -c37-|sed 's/^ *\(.*\) *$/\1/')
+ case $breeLine in
+ "J2SE-1.5")
+ bree=1.5
+ ;;
+ "JavaSE-1.6")
+ bree=1.6
+ ;;
+ esac
+ if [ "$bree" \> "$maxBree" ]; then
+ maxBree=$bree
+ fi
+ done
+}
+
+sourceDir=$PWD
+buildDir=$PWD/build
+SDK=$buildDir/SDK
+homeDir=$buildDir/home
+workspaceDir=$homeDir/workspace
+datadir=`rpm --eval "%{_libdir}"`
+pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
+
+featureId=
+dependencies=
+additionalArgs=
+vmArgs=
+verbose=0
+dryRun=0
+debugPlatform=0
+orbitDepsDir=
+p2Generate=
+testing=false
+zipDeps=
+
+# See above. r = dry run (used for testing)
+while getopts “hf:d:z:a:j:tvrDo:” OPTION
+do
+ case $OPTION in
+ h)
+ usage
+ exit
+ ;;
+ f)
+ featureId=$OPTARG
+ ;;
+ d)
+ dependencies=$OPTARG
+ ;;
+ a)
+ additionalArgs=$OPTARG
+ ;;
+ j)
+ vmArgs=$OPTARG
+ ;;
+ t)
+ testing=true
+ ;;
+ v)
+ verbose=1
+ ;;
+ r)
+ dryRun=1
+ ;;
+ D)
+ debugPlatform=1
+ ;;
+ o)
+ orbitDepsDir=$OPTARG
+ ;;
+ z)
+ zipDeps=$OPTARG
+ ;;
+ ?)
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+echo "mkdir -p $buildDir"
+if [ $dryRun -ne 1 ]; then
+ mkdir -p $buildDir
+fi
+
+# Eclipse may try to write to the building user's home directory so we create a
+# temporary one for use by the build.
+echo "mkdir -p $homeDir"
+if [ $dryRun -ne 1 ]; then
+ mkdir -p $homeDir
+fi
+
+echo "mkdir -p $workspaceDir"
+if [ $dryRun -ne 1 ]; then
+ mkdir -p $workspaceDir
+fi
+
+if [ -z $featureId ]; then
+ findFeatureId
+fi
+
+if [ -z $featureId ]; then
+ echo "Cannot determine feature ID. Please specify with -f."
+ usage
+ exit 1
+fi
+
+findFeatureNameAndVersion
+
+echo "Building feature = $featureId."
+
+if [ -z "$dependencies" ]; then
+ if [ $verbose -eq 1 ]; then
+ echo "Assuming no dependencies except Eclipse SDK."
+ fi
+fi
+
+# Symlink the SDK and dependencies for build
+if [ -z "$dependencies" ]; then
+ echo "Symlinking SDK into $SDK directory."
+else
+ echo "Symlinking SDK and \"$dependencies\" into $SDK directory."
+fi
+if [ $dryRun -ne 1 ]; then
+ copyPlatform
+fi
+
+if [ $debugPlatform -eq 1 ]; then
+ debugPlatformArgs="-debug -consolelog"
+fi
+
+if [ "x$orbitDepsDir" != "x" ]; then
+ orbitDeps="-DorbitDepsDir=$orbitDepsDir"
+fi
+
+if [ "x$zipDeps" != "x" ]; then
+ OLD_IFS="$IFS"
+ IFS=","
+ zipDepsArray=($zipDeps)
+ IFS="$OLD_IFS"
+ numZips=${#zipDepsArray[@]}
+ for (( i=0; i< $numZips; i++ )); do
+ thisZip=${zipDepsArray[$i]}
+ thisFile=$(basename $thisZip)
+ thisURL=$(echo $thisZip | sed s/$thisFile//)
+ if [ ! -e $thisFile ]; then
+ wget -q $thisZip
+ fi
+ mkdir -p tmp
+ unzip -q -o $thisFile -d tmp
+ cp -raf tmp/eclipse/features/* $SDK/features
+ cp -raf tmp/eclipse/plugins/* $SDK/plugins
+ rm -rf tmp
+ thisZip=
+ thisFile=
+ thisURL=
+ done
+fi
+if [ -z "$additionalArgs" ]; then
+ findMaxBREE
+ additionalArgs="-DjavacSource=$maxBree -DjavacTarget=$maxBree"
+fi
+
+echo "Starting build:"
+
+launcherJar=$(ls $SDK/plugins | grep "org.eclipse.equinox.launcher_")
+
+if [ $testing != true ]; then
+ java -cp $SDK/plugins/${launcherJar} \
+ -Duser.home=$homeDir \
+ $vmArgs \
+ org.eclipse.core.launcher.Main \
+ -data $workspaceDir \
+ -application org.eclipse.ant.core.antRunner \
+ $debugPlatformArgs \
+ -Dtype=feature \
+ -Did=$featureId \
+ -DbaseLocation=$SDK \
+ -DsourceDirectory=$sourceDir \
+ -DbuildDirectory=$buildDir \
+ -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
+ $orbitDeps \
+ -Dtesting="$testing" \
+ $additionalArgs \
+ -f $pdeBuildDir/scripts/build.xml
+else
+ echo "\
+ java -cp $SDK/plugins/${launcherJar} \
+ -Duser.home=$homeDir \
+ $vmArgs \
+ org.eclipse.core.launcher.Main \
+ -data $workspaceDir \
+ -application org.eclipse.ant.core.antRunner \
+ $debugPlatformArgs \
+ -Dtype=feature \
+ -Did=$featureId \
+ -DbaseLocation=$SDK \
+ -DsourceDirectory=$sourceDir \
+ -DbuildDirectory=$buildDir \
+ -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
+ $orbitDeps \
+ -Dtesting=\"$testing\" \
+ $additionalArgs \
+ -f $pdeBuildDir/scripts/build.xml
+ "
+fi
+
+exit $?
diff --git a/eclipse-populate-update-sites-from-master.patch b/eclipse-populate-update-sites-from-master.patch
new file mode 100644
index 0000000..9c52139
--- /dev/null
+++ b/eclipse-populate-update-sites-from-master.patch
@@ -0,0 +1,260 @@
+diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+index 2392378..526183c 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+@@ -7,7 +7,7 @@
+ Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+-Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
++Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.engine",
+ org.eclipse.equinox.internal.p2.core.helpers;
+ x-friends:="org.eclipse.equinox.frameworkadmin.test,
+ org.eclipse.equinox.p2.artifact.optimizers,
+diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+index cb812be2..21ba682 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+@@ -25,16 +25,19 @@
+ J2SE-1.4,
+ CDC-1.1/Foundation-1.1
+ Bundle-ActivationPolicy: lazy
+-Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml
++Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml,
++ OSGI-INF/MasterRepositoryPreferenceProvider.xml
+ Import-Package: javax.xml.parsers,
+ org.eclipse.core.internal.preferences,
+ org.eclipse.core.runtime.preferences,
++ org.eclipse.equinox.internal.p2.core,
+ org.eclipse.equinox.internal.p2.core.helpers,
+ org.eclipse.equinox.internal.p2.metadata,
+ org.eclipse.equinox.internal.p2.metadata.index,
+ org.eclipse.equinox.internal.p2.metadata.repository.io,
+ org.eclipse.equinox.internal.p2.persistence,
+ org.eclipse.equinox.internal.p2.repository,
++ org.eclipse.equinox.internal.p2.repository.helpers,
+ org.eclipse.equinox.internal.provisional.p2.core.eventbus,
+ org.eclipse.equinox.internal.provisional.p2.repository,
+ org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
+diff --git a/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml b/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml
+new file mode 100644
+index 0000000..026fa0e
+--- /dev/null
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/OSGI-INF/MasterRepositoryPreferenceProvider.xml
+@@ -0,0 +1,7 @@
++
++
++
++
++
++
++
+diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java
+new file mode 100644
+index 0000000..0fef156
+--- /dev/null
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java
+@@ -0,0 +1,65 @@
++/*******************************************************************************
++ * Copyright (c) 2012 Red Hat,Inc. and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ *
++ * Contributors:
++ * Red Hat,Inc. - initial API and implementation
++ *******************************************************************************/
++package org.eclipse.equinox.p2.engine;
++
++import java.net.URI;
++import java.net.URISyntaxException;
++import java.util.Hashtable;
++import org.eclipse.core.runtime.URIUtil;
++import org.eclipse.equinox.internal.p2.core.ProvisioningAgent;
++import org.eclipse.equinox.internal.p2.engine.EngineActivator;
++import org.eclipse.equinox.internal.p2.repository.Activator;
++import org.eclipse.equinox.internal.p2.repository.helpers.IMasterProfilePreferencesProvider;
++import org.eclipse.equinox.p2.core.IAgentLocation;
++import org.eclipse.equinox.p2.core.IProvisioningAgent;
++import org.osgi.framework.ServiceRegistration;
++import org.osgi.service.prefs.Preferences;
++
++public class MasterProfilePreferencesProvider implements IMasterProfilePreferencesProvider {
++
++ public Preferences getMasterPreferences(String profileName, String node) {
++
++ URI location;
++ try {
++ String sharedConfig = Activator.getContext().getProperty("osgi.sharedConfiguration.area"); //$NON-NLS-1$
++
++ if (sharedConfig == null)
++ return null;
++ //find where the profile is located by default
++ location = URIUtil.fromString(sharedConfig + "../p2" + '/'); //$NON-NLS-1$
++
++ } catch (URISyntaxException e1) {
++ //should not happen as Equinox will complain first.
++ return null;
++ }
++
++ if (location == null) {
++ // no master location, quit
++ return null;
++ }
++
++ // This is copied from tests
++ ProvisioningAgent agent = new ProvisioningAgent();
++ agent.setLocation(location);
++ agent.setBundleContext(EngineActivator.getContext());
++ IAgentLocation agentLocation = (IAgentLocation) agent.getService(IAgentLocation.SERVICE_NAME);
++ Hashtable props = new Hashtable();
++ props.put("locationURI", location.toString()); //$NON-NLS-1$
++
++ @SuppressWarnings("rawtypes")
++ ServiceRegistration reg = EngineActivator.getContext().registerService(IProvisioningAgent.SERVICE_NAME, agent, props);
++ try {
++ return new ProfileScope(agentLocation, profileName).getNode(node);
++ } finally {
++ reg.unregister();
++ }
++ }
++}
+diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+index e32ff0f..b1d12c1 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+@@ -26,7 +26,8 @@
+ org.eclipse.equinox.p2.operations,
+ org.eclipse.equinox.p2.repository.tools,
+ org.eclipse.equinox.p2.ui,
+- org.eclipse.equinox.p2.updatesite",
++ org.eclipse.equinox.p2.updatesite,
++ org.eclipse.equinox.p2.engine",
+ org.eclipse.equinox.internal.provisional.p2.repository,
+ org.eclipse.equinox.p2.repository;version="2.0.0",
+ org.eclipse.equinox.p2.repository.artifact;version="2.1.0",
+@@ -41,6 +42,7 @@
+ CDC-1.1/Foundation-1.1
+ Bundle-ActivationPolicy: lazy
+ Import-Package: javax.xml.parsers,
++ org.eclipse.core.internal.preferences,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.runtime.preferences;version="3.2.0",
+ org.eclipse.equinox.internal.p2.core,
+diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java
+new file mode 100644
+index 0000000..fac54ea
+--- /dev/null
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java
+@@ -0,0 +1,22 @@
++/*******************************************************************************
++ * Copyright (c) 2012 Red Hat,Inc. and others.
++ * All rights reserved. This program and the accompanying materials
++ * are made available under the terms of the Eclipse Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/epl-v10.html
++ *
++ * Contributors:
++ * Red Hat,Inc. - initial API and implementation
++ *******************************************************************************/
++package org.eclipse.equinox.internal.p2.repository.helpers;
++
++import org.osgi.service.prefs.Preferences;
++
++/**
++ * This service does its best to locate master profile and get preferences
++ * stored in master ProfileScope.
++ *
++ */
++public interface IMasterProfilePreferencesProvider {
++ public Preferences getMasterPreferences(String profileName, String node);
++}
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java.orig 2012-05-05 15:24:03.000000000 +0200
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java 2012-05-18 16:18:18.029669647 +0200
+@@ -9,6 +9,7 @@
+ * IBM Corporation - initial API and implementation
+ * Wind River - fix for bug 299227
+ * Sonatype, Inc. - transport split
++ * Red Hat,Inc. - fix for bug 249133
+ *******************************************************************************/
+ package org.eclipse.equinox.internal.p2.repository.helpers;
+
+@@ -33,6 +34,7 @@
+ import org.eclipse.osgi.util.NLS;
+ import org.osgi.service.prefs.BackingStoreException;
+ import org.osgi.service.prefs.Preferences;
++import org.osgi.util.tracker.ServiceTracker;
+
+ /**
+ * Common code shared between artifact and metadata repository managers.
+@@ -981,6 +983,61 @@
+ saveToPreferences();
+ }
+
++ private void restoreFromMasterPreferences() {
++ // restore the list of repositories from the preference store
++ Preferences node = getPreferences();
++ if (node == null)
++ return;
++
++ {
++ ServiceTracker tracker = new ServiceTracker(Activator.getContext(), IMasterProfilePreferencesProvider.class.getName(), null);
++ tracker.open();
++ IMasterProfilePreferencesProvider pprovider = tracker.getService();
++ if(pprovider == null) return;
++ String profileName = node.parent().parent().name();
++ String nodeName = node.parent().name();
++
++ Preferences rootNode = pprovider.getMasterPreferences(profileName, nodeName);
++
++ if (rootNode == null)
++ return;
++
++ /*repositories*/
++ node = rootNode.node(NODE_REPOSITORIES);
++ }
++
++ String[] children;
++ try {
++ children = node.childrenNames();
++ } catch (BackingStoreException e) {
++ log("Error restoring repositories from preferences", e); //$NON-NLS-1$
++ return;
++ }
++
++ for (int i = 0; i < children.length; i++) {
++ Preferences child = node.node(children[i]);
++ URI location = getRepositoryLocation(child);
++ if (location == null) {
++ try {
++ child.removeNode();
++ continue;
++ } catch (BackingStoreException e) {
++ log("Error removing invalid repository", e); //$NON-NLS-1$
++ }
++ }
++ RepositoryInfo info = new RepositoryInfo();
++ info.location = location;
++ info.name = child.get(KEY_NAME, null);
++ info.nickname = child.get(KEY_NICKNAME, null);
++ info.description = child.get(KEY_DESCRIPTION, null);
++ info.isSystem = child.getBoolean(KEY_SYSTEM, false);
++ info.isEnabled = child.getBoolean(KEY_ENABLED, true);
++ info.suffix = child.get(KEY_SUFFIX, null);
++ repositories.put(getKey(info.location), info);
++ }
++ }
++
++
+ private void restoreFromSystemProperty() {
+ String locationString = Activator.getContext().getProperty(getRepositorySystemProperty());
+ if (locationString != null) {
+@@ -1004,6 +1062,7 @@
+ restoreSpecialRepositories();
+ restoreFromSystemProperty();
+ restoreFromPreferences();
++ restoreFromMasterPreferences();
+ }
+ }
+
diff --git a/eclipse-remove-jgit-provider.patch b/eclipse-remove-jgit-provider.patch
new file mode 100644
index 0000000..185e3bb
--- /dev/null
+++ b/eclipse-remove-jgit-provider.patch
@@ -0,0 +1,22 @@
+--- eclipse-parent/pom.xml.bak 2012-08-09 16:08:45.000000000 +0200
++++ eclipse-parent/pom.xml 2012-08-09 16:10:22.504134998 +0200
+@@ -165,19 +165,9 @@
+ org.eclipse.tycho
+ tycho-packaging-plugin
+ ${tycho.version}
+-
+-
+- org.eclipse.tycho.extras
+- tycho-buildtimestamp-jgit
+- ${tycho-extras.version}
+-
+-
+
+ false
+ 'v'yyyyMMdd-HHmm
+- jgit
+-
+-
+
+
+
diff --git a/eclipse-remove-w3c-smil-and-use-geronimo.patch b/eclipse-remove-w3c-smil-and-use-geronimo.patch
new file mode 100644
index 0000000..d8465c8
--- /dev/null
+++ b/eclipse-remove-w3c-smil-and-use-geronimo.patch
@@ -0,0 +1,29 @@
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2012-02-24 09:22:22.000000000 +0100
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-02-24 14:23:21.289474792 +0100
+@@ -124,13 +124,6 @@
+ unpack="false"/>
+
+
+-
+-
+
+
+
+
+
+
+-
+-
+
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2012-07-27 14:50:27.668209657 +0200
+@@ -351,12 +351,6 @@
+ version="0.0.0"/>
+
+
+-
+-
+-
+-
+-
+-
+
+
+-
diff --git a/eclipse-set-1.6-bree.patch b/eclipse-set-1.6-bree.patch
new file mode 100644
index 0000000..ba4786d
--- /dev/null
+++ b/eclipse-set-1.6-bree.patch
@@ -0,0 +1,55 @@
+--- eclipse-parent/pom.xml.old 2012-07-26 13:10:45.117816261 +0200
++++ eclipse-parent/pom.xml 2012-07-26 13:07:41.336610064 +0200
+@@ -96,7 +96,7 @@
+ packages. This makes J2SE-1.4 effectively the minimal execution environment required by eclipse platform
+ build since many platform bundles directly or indirectly depend on org.eclipse.equinox.security.
+ -->
+- ?J2SE-1.4
++ ?JavaSE-1.6
+
+
+
+--- rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml.bak 2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml 2012-07-26 16:57:26.571579035 +0200
+@@ -31,7 +31,7 @@
+ target-platform-configuration
+
+
+- J2SE-1.5
++ ?JavaSE-1.6
+
+
+
+--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/pom.xml.bak 2012-07-25 17:42:07.000000000 +0200
++++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/pom.xml 2012-07-27 13:04:13.392040773 +0200
+@@ -32,7 +32,7 @@
+ target-platform-configuration
+
+
+- J2SE-1.5
++ JavaSE-1.6
+
+
+
+--- eclipse.platform.releng/features/master/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master/pom.xml 2012-07-27 13:13:35.876618847 +0200
+@@ -33,7 +33,7 @@
+ org.eclipse.tycho
+ target-platform-configuration
+
+- J2SE-1.5
++ JavaSE-1.6
+
+
+ wce_ppc
+--- eclipse.platform.releng/features/master-equinox/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master-equinox/pom.xml 2012-07-27 14:26:18.119956202 +0200
+@@ -33,7 +33,7 @@
+ org.eclipse.tycho
+ target-platform-configuration
+
+- J2SE-1.5
++ JavaSE-1.6
+
+
+
diff --git a/eclipse.desktop b/eclipse.desktop
new file mode 100644
index 0000000..2fcbf87
--- /dev/null
+++ b/eclipse.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Eclipse
+Comment=Eclipse Integrated Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Categories=Development;IDE;Java;
\ No newline at end of file
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 ||g" plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
+sed -i -e "s|#include ||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) (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) (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) (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) (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)(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)(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/org.eclipse.sdk.epp<\/id>/org.fedoraproject.eclipse.platform<\/id>/" TMP/org.eclipse.sdk.epp/pom.xml
+sed -i -e "s///" 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/TMP\/org.eclipse.sdk.epp<\/module>/TMP\/org.eclipse.sdk.epp<\/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/rt.equinox.p2<\/module>/rt.equinox.p2<\/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," >> $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," >> $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 1:4.2.0-9
+- Adopt upstream CBI system.
+
* Tue Aug 14 2012 Krzysztof Daniel 1:4.2.0-8
- Symlink emf bundles.
diff --git a/efj.sh b/efj.sh
new file mode 100755
index 0000000..9e68076
--- /dev/null
+++ b/efj.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+java -cp @LAUNCHER@ org.eclipse.core.launcher.Main \
+ -application org.eclipse.jdt.core.JavaCodeFormatter \
+ ${1+"$@"}
diff --git a/extract_patterns.txt b/extract_patterns.txt
new file mode 100644
index 0000000..8e0dff8
--- /dev/null
+++ b/extract_patterns.txt
@@ -0,0 +1 @@
+.* = *.so
\ No newline at end of file
diff --git a/get-eclipse.sh b/get-eclipse.sh
new file mode 100755
index 0000000..484e22d
--- /dev/null
+++ b/get-eclipse.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+rm -rf R4_platform-aggregator
+
+git clone -b Juno_RC4_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
+
+find . -type d -name ".git" -exec rm -rf {} \;
+
+find . -type f -name "*.class" -exec rm -rf {} \;
+
+find . -name *.jar -exec rm -rf {} \;
+
+find . -type f -name *.so -exec rm -rf {} \;
+
+tar cjf eclipse-source.tar.bz R4_platform-aggregator
diff --git a/initializer.pom.xml b/initializer.pom.xml
new file mode 100644
index 0000000..68c53f3
--- /dev/null
+++ b/initializer.pom.xml
@@ -0,0 +1,36 @@
+
+
+ 4.0.0
+
+ rt.equinox.incubator
+ org.eclipse.equinox.framework
+ 3.8.0-SNAPSHOT
+ ../../..
+
+ org.eclipse.equinox.framework
+ org.eclipse.equinox.initializer
+ 1.0.0-SNAPSHOT
+ eclipse-plugin
+
+
+
+
+
+ org.eclipse.tycho
+ target-platform-configuration
+
+
+
+
+ eclipse-plugin
+ org.eclipse.core.runtime
+ [2,5)
+
+
+
+
+
+
+
+
diff --git a/lucene-3.6-compile.patch b/lucene-3.6-compile.patch
index d4fe21c..dea6868 100644
--- a/lucene-3.6-compile.patch
+++ b/lucene-3.6-compile.patch
@@ -1,5 +1,5 @@
---- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300
-+++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300
+--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300
++++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300
@@ -95,4 +95,8 @@ public final class WordTokenStream exten
return tokens.get(token++);
diff --git a/pre360changelog.txt b/pre360changelog.txt
deleted file mode 100644
index 4dab096..0000000
--- a/pre360changelog.txt
+++ /dev/null
@@ -1,1836 +0,0 @@
-* Thu Jul 08 2010 Alexander Kurtakov 1:3.5.2-10
-- Rebuild for new jetty.
-
-* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-9
-- Fix typo in symlinking.
-
-* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-8
-- No need to link jasper.
-
-* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-7
-- Fix servlet and jsp apis symlinks.
-
-* Thu Jun 17 2010 Alexander Kurtakov 1:3.5.2-6
-- Fix jetty symlinks.
-
-* Thu Jun 10 2010 Andrew Overholt 1:3.5.2-5
-- Move hamcrest to dropins/jdt (rhbz#601059).
-- Re-symlink after provisioning (rhbz#602865).
-
-* Mon Apr 12 2010 Andrew Overholt 1:3.5.2-4
-- Rebuild to pick up new xulrunner.
-
-* Fri Mar 19 2010 Alexander Kurtakov 1:3.5.2-3
-- Use eclipse-build 0.5.0 release.
-
-* Mon Mar 8 2010 Alexander Kurtakov 1:3.5.2-2
-- Fix multilib install.
-
-* Sun Mar 7 2010 Alexander Kurtakov 1:3.5.2-1
-- Update to 3.5.2.
-
-* Thu Jan 07 2010 Andrew Overholt 1:3.5.1-28
-- Version Provides for "eclipse" and "eclipse-sdk" (-pde).
-
-* Tue Dec 22 2009 Andrew Overholt 1:3.5.1-27
-- Fix patch application.
-
-* Tue Dec 22 2009 Andrew Overholt 1:3.5.1-26
-- Backport eclipse-build patch for e.o#291128.
-
-* Tue Dec 15 2009 Alexander Kurtakov 1:3.5.1-25
-- Fix o.e.jdt.junit dropins issue. RHBZ#538803 (Thanks to Patrick Higgins).
-
-* Fri Dec 4 2009 Alexander Kurtakov 1:3.5.1-24
-- Replace gecko BR/Rs with xulrunner.
-- Drop xulrunner-devel-unstable now that it's merged in xulrunner-devel.
-
-* Thu Dec 3 2009 Alexander Kurtakov 1:3.5.1-23
-- Remove old manipulations to bundles.info.
-- Update to eclipse-build 0.4 release.
-
-* Mon Nov 30 2009 Andrew Overholt 1:3.5.1-22
-- Move ant-nodeps out of bootstrap.
-
-* Tue Nov 17 2009 Andrew Overholt 1:3.5.1-21
-- Fix typo in memory settings.
-
-* Tue Nov 17 2009 Alexander Kurtakov 1:3.5.1-20
-- Fix ppc64 swt jar version.
-
-* Mon Nov 16 2009 Andrew Overholt 1:3.5.1-19
-- Temporarily patch for e.o#294877.
-- Fix some whitespace.
-
-* Fri Nov 13 2009 Alexander Kurtakov 1:3.5.1-18
-- No about files on ppc64 too.
-
-* Wed Nov 11 2009 Alexander Kurtakov 1:3.5.1-17
-- Update to eclipse-build 0.4 RC4 (fixes pdebuild escaping).
-
-* Tue Nov 10 2009 Alexander Kurtakov 1:3.5.1-16
-- Specify -DbuildArch when running ant applyPatches.
-
-* Tue Nov 10 2009 Alexander Kurtakov 1:3.5.1-15
-- Update to eclipse-build 0.4 RC3.
-
-* Fri Nov 10 2009 Alexander Kurtakov 1:3.5.1-14
-- Fix build with commons-codec 1.4.
-
-* Fri Oct 30 2009 Andrew Overholt 1:3.5.1-13
-- Make /usr/bin/eclipse a wrapper script due to rhbz#531675 (e.o#290395).
-
-* Mon Oct 26 2009 Andrew Overholt 1:3.5.1-12
-- Remove old TODO items.
-
-* Fri Oct 23 2009 Alexander Kurtakov 1:3.5.1-12
-- No need to invoke desktop-file-install, it's handled by e-b install now.
-
-* Thu Oct 22 2009 Alexander Kurtakov 1:3.5.1-11
-- Remove ppc64 files copying and sedding. Supported by eclipse-build now.
-
-* Tue Oct 20 2009 Alexander Kurtakov 1:3.5.1-10
-- Remove old/not needed BR/Rs.
-
-* Mon Oct 19 2009 Alexander Kurtakov 1:3.5.1-9
-- New e-b snapshot that contains fragments for ppc64.
-
-* Thu Oct 15 2009 Alexander Kurtakov 1:3.5.1-8
-- Add bootstrap flag.
-
-* Mon Oct 12 2009 Alexander Kurtakov 1:3.5.1-7
-- Put back JAVA_HOME.
-
-* Mon Oct 12 2009 Alexander Kurtakov 1:3.5.1-6
-- New eclipse-build snapshot. Pdebuild and ecf compilation are part of it.
-
-* Thu Oct 8 2009 Alexander Kurtakov 1:3.5.1-5
-- Fix install call.
-
-* Thu Oct 8 2009 Alexander Kurtakov 1:3.5.1-4
-- New eclipse-build snapshot. Remove parts included in it.
-
-* Wed Oct 07 2009 Andrew Overholt 1:3.5.1-3
-- Add patch for bugs.eclipse.org/287307
-
-* Mon Oct 5 2009 Alexander Kurtakov 1:3.5.1-2
-- Add /usr/share/eclipse/dropins to dropins locations.
-
-* Fri Oct 2 2009 Alexander Kurtakov 1:3.5.1-1
-- Update to 3.5.1.
-
-* Tue Sep 29 2009 Alexander Kurtakov 1:3.5.0-4
-- Symlink to unversioned jetty jars.
-
-* Tue Sep 29 2009 Alexander Kurtakov 1:3.5.0-3
-- Build with eclipse-build 0.4.0 RC0.
-
-* Wed Sep 23 2009 Andrew Overholt 1:3.5.0-2
-- Move jakarta-commons-codec requirement from jdt to platform.
-
-* Tue Sep 22 2009 Alexander Kurtakov 1:3.5.0-1
-- Fix help toolbar jsp problem.
-
-* Fri Sep 18 2009 Alexander Kurtakov 1:3.5.0-0.13
-- Update ecf-filetransfer and build it.
-
-* Tue Sep 15 2009 Alexander Kurtakov 1:3.5.0-0.12
-- Build with system jetty.
-
-* Mon Sep 14 2009 Andrew Overholt 1:3.5.0-0.11
-- Add /usr/share/eclipse/dropins to list of dropins locations
- (rhbz#522117).
-
-* Wed Sep 09 2009 Mat Booth 1:3.5.0-0.10
-- Patch the target platform templates so they find all the required
- source bundles (see RHBZ # 521969).
-
-* 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.
-
-* 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.
-
-* Thu Aug 13 2009 Alexander Kurtakov 1:3.5.0-0.5
-- Add epoch to icu4j Requires/BuildRequires.
-
-* Tue Aug 11 2009 Alexander Kurtakov 1:3.5.0-0.4.0
-- Fix sources url.
-- Make it use system icu4j and sat4j.
-
-* Fri Aug 7 2009 Alexander Kurtakov 1:3.5.0-0.3.35
-- Another missing ppc64 fragment.
-
-* Fri Aug 7 2009 Alexander Kurtakov 1:3.5.0-0.3.34
-- Fix missing fragment on ppc64.
-
-* Thu Aug 6 2009 Alexander Kurtakov 1:3.5.0-0.3.33
-- Fix missing launcher for ppc64.
-
-* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.32
-- Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64.
-
-* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.31
-- Revert initialize call path changes.
-
-* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.30
-- Additional output to debug ppc64 build failures.
-
-* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.29
-- Reenable initialize.
-- Fix paths in initializer call.
-
-* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.28
-- Disable initialize.
-
-* Tue Aug 4 2009 Alexander Kurtakov 1:3.5.0-0.3.27
-- No need to copy eclipse.ini for secondary archs.
-
-* Tue Aug 4 2009 Alexander Kurtakov 1:3.5.0-0.3.26
-- eclipse/about_files are not installed on ppc for some reason.
-
-* Mon Aug 3 2009 Alexander Kurtakov 1:3.5.0-0.3.25
-- Swith to eclipse-build for building.
-
-* Fri Jul 24 2009 Fedora Release Engineering - 1:3.5.0-0.3.9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 17 2009 Alexander Kurtakov 1:3.5.0-0.2.9
-- Fix package-build template to add target for -Dconfigs.
-
-* Tue May 19 2009 Andrew Overholt 1:3.5.0-0.2.8
-- Remove Fedora branding.
-
-* Thu May 7 2009 Andrew Overholt 1:3.5.0-0.2.7
-- Update patch to tests' library.xml to allow for easy debugging of tests.
-
-* Wed Apr 29 2009 Alexander Kurtakov 1:3.5.0-0.2.6
-- Fix initializer run (sed again).
-
-* Wed Apr 29 2009 Alexander Kurtakov 1:3.5.0-0.2.5
-- Bump tomcat6 BR.
-- Fix director run to not require sed on bundles.info.
-
-* Wed Apr 22 2009 Alexander Kurtakov 1:3.5.0-0.2.4
-- Update to newer I-build.
-- Update fedora customization.
-- Bump dependencies minimal versions.
-- Fix update site functionality.
-- Simplify jdt %%files section.
-
-* Tue Apr 14 2009 Alexander Kurtakov 1:3.5.0-0.2.3
-- Rediff patch30.
-
-* Tue Apr 14 2009 Alexander Kurtakov 1:3.5.0-0.2.2
-- Fix version of source bundles.
-
-* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.2.1
-- Create org.eclipse.swt.gtk.linux.* based on the ppc version.
-
-* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.2
-- Remove patches for the ecj package and others already applied upstream.
-- Rediff some ppc64 patches.
-
-* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.12
-- o.e.update.core.linux is x86 only.
-
-* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.11
-- Remove more p2 generated files.
-
-* Mon Apr 13 2009 Alexander Kurtakov 1:3.5.0-0.1.10
-- Do not install p2 generatad file.
-
-* Fri Apr 10 2009 Alexander Kurtakov 1:3.5.0-0.1.9
-- BR/R jakarta-commons-codec and jakarta-commons-httpclient.
-
-* Thu Apr 9 2009 Alexander Kurtakov 1:3.5.0-0.1.8
-- Add patch for xulrunner compilation.
-
-* Tue Apr 7 2009 Alexander Kurtakov 1:3.5.0-0.1.7
-- Fix patch name.
-
-* Thu Apr 2 2009 Alexander Kurtakov 1:3.5.0-0.1.6
-- First try for 3.5 build.
-
-* Mon Mar 30 2009 Dennis Gilmore 1:3.4.2-6
-- base sparcv9 and sparc on ppc
-
-* Fri Mar 20 2009 Alexander Kurtakov 1:3.4.2-5
-- Disable XULRunner-specific patch.
-- Make pdebuild script to not generate p2 repo.
-
-* Mon Mar 16 2009 Andrew Overholt 1:3.4.2-4
-- Build with XULRunner-specific flags since we're building against XULRunner.
-
-* Mon Mar 9 2009 Andrew Overholt 1:3.4.2-3
-- Remove ecj sub-package as it is replaced by standalone ecj package.
-
-* Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-2
-- Strict R/BR for sat4j >= 2.0.3.
-
-* Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-1
-- Update to 3.4.2.
-
-* Tue Feb 24 2009 Fedora Release Engineering - 1:3.4.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 4 2009 Alexander Kurtakov 1:3.4.1-15
-- Rebuild for new xulrunner.
-
-* Fri Jan 23 2009 Andrew Overholt 1:3.4.1-14
-- Add R:java-devel for -jdt (rh#480979).
-
-* Mon Jan 19 2009 Alexander Kurtakov 1:3.4.1-13
-- Fix pdebuild to auto-set javacSouce based on BREE.
-
-* Fri Dec 19 2008 Andrew Overholt 1:3.4.1-12
-- Fixed GCJ AOT compilation (Gary Benson).
-
-* Mon Dec 15 2008 Andrew Overholt 1:3.4.1-11
-- Update pdebuild and package-build patch to include -z option.
-- Make ecj default to 1.5 (rh#354721).
-- Add GCJ AOT bits for ecj (rh#473674).
-
-* Fri Dec 5 2008 Andrew Overholt 1:3.4.1-10
-- Remove MaxPermSize from sysproperty lists in library.xml as it was causing the
- JVM to not start.
-
-* Thu Dec 4 2008 Andrew Overholt 1:3.4.1-8
-- Increase MaxPermSize when running tests.
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1:3.4.1-8
-- Rebuild for Python 2.6
-
-* Thu Nov 20 2008 Andrew Overholt 3.4.1-7
-- Update and re-enable patch for always generating debuginfo for class files
- when doing an RPM build.
-- Resolves rh#472292.
-
-* Mon Oct 27 2008 Andrew Overholt 3.4.1-6
-- Keep Provides: eclipse on -pde (different than Fedora 9 but probably
- more correct).
-
-* Thu Oct 23 2008 Alexander Kurtakov 3.4.1-5
-- Fix splashscreen (#467259).
-
-* Fri Oct 17 2008 Andrew Overholt 3.4.1-4
-- Fix quoting bug in pdebuild.sh again.
-
-* Fri Oct 16 2008 Alexander Kurtakov 3.4.1-3
-- Fix swt symlinks in %%libdir/eclipse.
-
-* Thu Oct 16 2008 Alexander Kurtakov 3.4.1-2
-- Fix quoting bug in pdebuild.sh.
-
-* Wed Oct 16 2008 Alexander Kurtakov 3.4.1-1
-- Move copy-platform instead of copying it.
-
-* Wed Oct 15 2008 Andrew Overholt 3.4.1-1
-- Add conditionals around Equinox initialization to enable debugging.
-
-* Fri Oct 13 2008 Alexander Kurtakov 3.4.1-1
-- Symlink to ant-apache-bsf and ant-commons-net.
-- Update branding.
-- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008).
-- Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt)
-- Resolves #466476. Fix pdebuild script. (Jeff Johnston)
-- Remove dropins contents while running initializer.
-- Add patch for wrong javaHome on x86_64 in the native build.(Alexander Kurtakov)
-
-* Thu Oct 03 2008 Alexander Kurtakov 3.4.1-0
-- 3.4.1
-- Update nojarsignatures patch.
-- Added osgi-classpath.patch fixes broken bootclasspath (Sean Flanigan).
-- Removed patches 33 and 34 - not needed anymore.
-
-* Thu Sep 25 2008 Michal Nowak 3.4.0-24
-- exclude parts of eclipse-pydev from JIT compilation
-- Resolves: bug 461860
-
-* Tue Sep 02 2008 Andrew Overholt 3.4.0-23
-- Use icu4j in its new place.
-
-* Wed Aug 27 2008 Andrew Overholt 3.4.0-22
-- Add test framework
-- Remove two duplicate lines in eclipse-mv-Platform.sh
-- Modify package-build and pdebuild so they can build the SDK tests
-
-* Wed Aug 13 2008 Andrew Overholt 3.4.0-21
-- Fix ecj-gcj (rhbz#458921)
-
-* Tue Aug 12 2008 Andrew Overholt 3.4.0-20
-- Require release of jetty which requires tomcat bits with proper metadata
-- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)
-- Add version to jakarta-commons-el requirement
-
-* Mon Aug 11 2008 Andrew Overholt 3.4.0-19
-- Move jdt and sdk dropins contents to non-eclipse-sub-dir place which
- makes dropins reconciler see them as dropins and not extension
- locations
-- Add versions to jetty, lucene, and jsch Requires
-
-* Thu Aug 07 2008 Andrew Overholt 3.4.0-18
-- Add %%{_libdir}/eclipse/dropins/jdt to ecj files list
-
-* Wed Aug 06 2008 Andrew Overholt 3.4.0-17
-- Add p2 metadata generation to pdebuild
-- Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
- copy-platform
-- Fix brightness in splash screen
-- Fix icon symlinks
-- Bump icu4j-eclipse requirement
-
-* Tue Aug 05 2008 Andrew Overholt 3.4.0-16
-- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
-- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
-- Update copy-platform to add %%{_datadir}/dropins
-
-* Mon Aug 04 2008 Sean Flanigan 3.4.0-15
-- Removed buildroot from path in datadir.link
-
-* Mon Aug 04 2008 Sean Flanigan 3.4.0-14
-- Created missing directory for link file
-
-* Fri Aug 01 2008 Andrew Overholt 3.4.0-13
-- Update patch to avoid Hotspot crashing
-- Add links folder for noarch plugins
-- Create and add ownership of %%{_datadir}/eclipse/{plugins,features}
-
-* Thu Jul 31 2008 Andrew Overholt 3.4.0-12
-- Set product to Fedora Eclipse
-- Remove pde-runtime %%package section
-- Remove unnecessary Requires(post,postun)s
-
-* Wed Jul 30 2008 Andrew Overholt 3.4.0-11
-- Update copy-platform to work with dropins
-- Update JVM-crashing patch
-
-* Mon Jul 28 2008 Andrew Overholt 3.4.0-10
-- Move JDT and PDE/SDK bits to dropins/{jdt,sdk}
-- Drop versionless PDE Build symlink (put logic into pdebuild script)
-- Make SWT JAR symlinks relative
-- Fold pde-runtime into pde
-- Add patch to add root files for non-upstream arches
-- Fix building of fragments for non-upstream arches
-- Remove about.html from files list on ppc (will fix later)
-
-* Fri Jul 25 2008 Andrew Overholt 3.4.0-10
-- Add ability for pdebuild (-o) to work with Orbit-style dependencies
-
-* Fri Jul 25 2008 Andrew Overholt 3.4.0-9
-- Collapse patches to build SWT native bits into two
-- Copy about* from x86 to all non-x86{_64} platforms
-
-* Wed Jul 23 2008 Andrew Overholt 3.4.0-8
-- Don't build for arch/ws/os combos other than the one on which we're
- building
-
-* Wed Jul 23 2008 Andrew Overholt 3.4.0-7
-- More work on non-upstream arches
-
-* Mon Jul 21 2008 Andrew Overholt 3.4.0-6
-- Update description to be a bit more current
-- Attempt ppc64, etc. builds
-
-* Mon Jul 21 2008 Andrew Overholt 3.4.0-5
-- Add core.net fragment in %%files for x86
-- I spoke with author about above and no .so is built because it is
- currently not used by the fragment
-- Update ecj-gcj addition (Tom Tromey)
-
-* Fri Jul 18 2008 Andrew Overholt 3.4.0-4
-- Un-do crazy config.ini, bundles.info, etc. shuffling
-- Update patch for building native libraries
-- Re-add missing BR on tomcat5-jasper-eclipse
-- Add patch for 64-bit platforms to build SWT
-- Don't try to resolve http://bundles.osgi.org for javadocs
-- Provision with java -cp instead of binary launcher
-
-* Thu Jul 17 2008 Andrew Overholt 3.4.0-3
-- Generate metadata and provision each sub-package
-- Do crazy config.ini, bundles.info, and *.profile shuffling
-- Add post and postun sections to update the config.ini, bundles.info, and
- *.profile files
-
-* Wed Jul 16 2008 Andrew Overholt 3.4.0-1
-- Fix files lists
-
-* Wed Jul 16 2008 Andrew Overholt 3.4.0-1
-- Update branding
-- Fix p2 stuff so p2 UI works
-
-* Mon Jul 14 2008 Andrew Overholt 3.4.0-1
-- 3.4
-- Remove gcj compilation
-- Update versions of dependencies
-- Rename libswt3-gtk2 to eclipse-swt
-- Move "Provides: eclipse" to PDE from JDT
-- Remove unnecessary old Obsoletes/Provides
-- Remove tomcat stuff since it's no longer used
-- Move stuff from %%{_datadir}/eclipse to %%{_libdir}/eclipse
-- Add BRs/Rs on objectweb-asm and sat4j
-- Build ECF filetransfer stuff as part of this SRPM until we have a
- separate eclipse-ecf package (which will require this version of the
- SDK)
-
-* Sat Jun 14 2008 Dennis Gilmore 3.3.2-13
-- make changes to support sparcv9
-
-* Wed May 14 2008 Andrew Overholt 3.3.2-12
-- Back-port patch for e.o#206432 (rh#446064).
-
-* Sat Apr 26 2008 Mat Booth 3.3.2-11
-- Fixed some benign errors in copy-platform when calling pdebuild
- multiple times.
-
-* Fri Apr 25 2008 Andrew Overholt 3.3.2-10
-- Bump maximum heap size from 256 MB to 512 MB.
-- Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
- (which is really
- http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100).
-- Some jiggery-pokery for spaces in SWT paths for buildagainstxulrunner
- patch.
-
-* Wed Apr 09 2008 Andrew Overholt 3.3.2-9
-- Fix patch level for xulrunner build patch.
-
-* Wed Apr 09 2008 Andrew Overholt 3.3.2-8
-- Rather than removing java-javadoc, just add Requirement in all cases
- (gcj or not).
-
-* Wed Apr 09 2008 Andrew Overholt 3.3.2-7
-- Remove explicit java-javadoc requirements as OpenJDK's -devel package
- provides it.
-- Patch SWT build to find libxul.pc.
-
-* Fri Apr 04 2008 Andrew Overholt 3.3.2-6
-- Fix path of pdebuild in %%files. Gah.
-
-* Fri Apr 04 2008 Andrew Overholt 3.3.2-5
-- Move pdebuild to better location (buildscripts).
-
-* Fri Apr 04 2008 Andrew Overholt 3.3.2-4
-- Fix SWT version in Requires.
-
-* Thu Apr 03 2008 Andrew Overholt 3.3.2-3
-- Add missing line continuation.
-
-* Thu Apr 03 2008 Andrew Overholt 3.3.2-2
-- Change ecj Provides from <= to = (rhbz#439825).
-
-* Thu Apr 03 2008 Andrew Overholt 3.3.2-1
-- 3.3.2
-- Update Obsoletes/Provides for ecj and make more ecj symlinks
- (rhbz#439825).
-
-* Mon Mar 31 2008 Andrew Overholt 3.3.1.1-18
-- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for
- packaging guidelines.
-
-* Mon Mar 03 2008 Andrew Overholt 3.3.1.1-17
-- Mark eclipse.ini as %%config.
-
-* Tue Feb 19 2008 Fedora Release Engineering - 1:3.3.1.1-16
-- Autorebuild for GCC 4.3
-
-* Fri Feb 08 2008 Andrew Overholt 3.3.1.1-15
-- Add ia64 patches from Doug Chapman.
-- rhbz#431963.
-
-* Wed Dec 05 2007 Martin Stransky 3.3.1.1-14
-- rebuilt against XUL Runner (gecko-libs 1.9)
-- removed .png extension from the desktop file
-
-* Tue Dec 04 2007 Andrew Overholt 3.3.1.1-13
-- Remove Fedora log from splash screen.
-
-* Mon Dec 03 2007 Andrew Overholt 3.3.1.1-12
-- Update splash screen.
-
-* Fri Nov 30 2007 Andrew Overholt 3.3.1.1-11
-- Fix PermSize option (thanks to Mary Ellen Foster for testing).
-
-* Fri Nov 23 2007 Andrew Overholt 3.3.1.1-10
-- Move eclipse.ini for real.
-
-* Fri Nov 23 2007 Andrew Overholt 3.3.1.1-9
-- Move eclipse.ini in %%files section.
-
-* Thu Nov 22 2007 Andrew Overholt 3.3.1.1-8
-- Re-enable gcj_support.
-
-* Thu Nov 22 2007 Andrew Overholt 3.3.1.1-7
-- Un-break non-ppc64 platforms.
-
-* Mon Nov 19 2007 Andrew Overholt 3.3.1.1-6
-- Require jpackage-utils (courtesy Patrice Dumas).
-- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
-- Move eclipse.ini to %%{_libdir}/eclipse where it gets read.
-- Resolves: rhbz#394161.
-
-* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-5
-- Remove extraneous build.index comment (from test build again).
-
-* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-4
-- Enable gcj support (disabled for test build).
-
-* Fri Nov 16 2007 Andrew Overholt 3.3.1.1-3
-- Update tomcat patches.
-- Resolves: rhbz#380121.
-
-* Wed Nov 14 2007 Andrew Overholt 3.3.1.1-2
-- Bump release to tag non-corrupted source zip.
-
-* Thu Nov 01 2007 Andrew Overholt 3.3.1.1-1
-- Update branding.
-- Work around e.o#195897 by setting the VM arg explicitly.
-
-* Fri Oct 26 2007 Andrew Overholt 3.3.1.1-1
-- 3.3.1.1
-- Add patch for memory issues with IcedTea.
-
-* Mon Oct 22 2007 Andrew Overholt 3.3.1-1
-- 3.3.1
-- Update icu4j requirement for new version number.
-
-* Thu Oct 11 2007 Andrew Overholt 3.3.0-27
-- Add patch to have unversioned swt.jar symlink (courtesy Patrice
- Dumas).
-
-* Sat Oct 06 2007 Andrew Overholt 3.3.0-26
-- Add encoding to desktop file.
-- Fix %%files list again.
-
-* Fri Oct 05 2007 Andrew Overholt 3.3.0-25
-- Fix %%files list for Fedora Eclipse feature.
-
-* Fri Oct 05 2007 Andrew Overholt 3.3.0-24
-- Update branding plugin.
-- Add branding feature. This fixes the update manager issue when using
- the Fedora-branded product.
-- Thanks to Alexander Kurtakov and Pascal Rapicault for helping track
- down this issue.
-
-* Wed Oct 03 2007 Andrew Overholt 3.3.0-23
-- Build gcj bits on x86 and x86_64.
-- Add instructions for how to get source of branding plugin.
-- Fix splash screen typo.
-- Resolves: rhbz#301871.
-
-* Wed Sep 26 2007 Andrew Overholt 3.3.0-21
-- Add patch to generate 1.6 bytecode on a 1.7 VM (kudos to Olivier
- Thomann)
-- Resolves: rhbz#288991.
-
-* Tue Sep 18 2007 Andrew Overholt 3.3.0-20
-- Move requirements on subclipse, cdt, mylyn, etc. to comps.xml.
-
-* Mon Sep 10 2007 Andrew Overholt 3.3.0-19
-- Don't require subclipse, cdt, or rpm-editor on ppc64.
-
-* Fri Sep 07 2007 Ben Konrath 3.3.0-18
-- Build 1.6 plugins when building with IcedTea.
-
-* Fri Sep 07 2007 Ben Konrath 3.3.0-17
-- Update Fedora Eclipse product plugin to fix Welcome page.
-
-* Thu Sep 06 2007 Ben Konrath 3.3.0-16
-- Compile SDK to 1.5 bytecode and disable 1.6 plugins.
-
-* Wed Sep 05 2007 Andrew Overholt 3.3.0-15
-- Update tomcat5, commons-el, and commons-logging to required releases
- with proper OSGi manifests.
-
-* Mon Sep 04 2007 Ben Konrath 3.3.0-14
-- Add Fedora Eclipse product plugin.
-- Add Requires: eclipse-rpm-editor to platform subpackage.
-
-* Thu Aug 30 2007 Ben Konrath 3.3.0-13
-- Move *-sdk subpackages to pde subpackage.
-- Add BuildRequires: libXt-devel for IcedTea build.
-- Add launcher-fix-java-home.patch.
-
-* Tue Aug 28 2007 Ben Konrath 3.3.0-12
-- Require mylyn on all archs except ppc64 alpha.
-- Use IcedTea on x86_64 and x86.
-- Remove hacks for s390{,x} as they are now included in upstream build.
-
-* Tue Aug 28 2007 Andrew Overholt 3.3.0-11
-- Symlink to jetty.
-
-* Tue Aug 28 2007 Ben Konrath 3.3.0-10
-- Add requires eclipse-cvs-client, eclipse-subclipse, eclipse-mylyn,
- eclipse-mylyn-ide, eclipse-mylyn-bugzilla, eclipse-mylyn-trac
- and eclipse-changelog to platform package.
-- Add requires eclipse-mylyn-java to jdt.
-- Add requires eclipse-mylyn-pde to pde.
-- Remove pde-sdk and sdk sub-packages
-
-* Thu Aug 23 2007 Ben Konrath 3.3.0-9
-- Add Requires: eclipse-cvs-client to jdt package.
-
-* Tue Aug 14 2007 Ben Konrath 3.3.0-8
-- Link to junit4 jar.
-- Remove included eclipse binaries.
-- Add Provides: eclipse to sdk subpackage.
-
-* Mon Aug 13 2007 Oliver Falk 3.3.0-7
-- Also explode SDK tarball on alpha
-- Resolves: #251958
-
-* Tue Aug 07 2007 Ben Konrath 3.3.0-6
-- Add links for jsp api, servlet api and jasper.
-- Add %%{_libdir}/%%{name}/features to the rcp %%files listing.
-
-* Fri Aug 03 2007 Ben Konrath 3.3.0-5
-- Add patch to fix double free bug in launcher library.
-- Resolves: #248798.
-
-* Tue Jul 31 2007 Ben Konrath 3.3.0-4
-- Link to commons-el.jar.
-- Remove ant 1.7 hacks.
-
-* Wed Jul 18 2007 Ben Konrath 3.3.0-3
-- Add links for lucene and lucene.analysis.
-- Remove icu4j symlink from /usr/share/eclipse/plugins.
-- Resolves: #248749.
-
-* Mon Jul 16 2007 Ben Konrath 3.3.0-2
-- Fix dep in rcp sub-package.
-- Add Alpha support.
-- Link to commons-logging.jar
-- Resolves: #248359.
-
-* Fri Jun 29 2007 Ben Konrath 3.3.0-1
-- 3.3.
-
-* Wed Jun 27 2007 Ben Konrath 3.3.0-0.3.RC4
-- Restore ppc64, s390{,x} and sparc{,64} support.
-- Restore multilib support.
-
-* Tue Jun 19 2007 Ben Konrath 3.3.0-0.2.RC4
-- Use icu4j-eclipse sub-package instead of building icu4j here.
-- Use exec in binary wrapper.
-- Add 3.3.0 splashscreen.
-
-* Tue Jun 12 2007 Ben Konrath 3.3.0-0.1.RC4
-- 3.3RC4.
-
-* Mon Jun 11 2007 Ben Konrath 3.3.0-0.2.RC3
-- Update launching strategy for 3.3.
-- Pull in package-build fix from F-7.
-
-* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC3
-- 3.3RC3.
-
-* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC2
-- 3.3RC2.
-
-* Wed May 23 2007 Ben Konrath 3.3.0-0.1.RC1
-- 3.3RC1.
-- Pull in changes from F-7.
-
-* Mon Feb 26 2007 Ben Konrath 3.3.0-0.1.M5eh
-- 3.3M5.
-- Remove launcher-addplatformtotildeeclipse.patch as it's only needed
- for FC-5 -> FC-6.
-- Remove swt firefox patches as they are no longer needed.
-- Remove ppc64, s390{,x} and sparc{,64} support.
-- Remove use-built-launcher patch.
-- Update set-launcher-and-configuration-dir patch.
-
-* Mon Jan 29 2007 Ben Konrath 3.3.0-0.3.M4
-- Enable updated ecj square brackets patch.
-
-* Fri Jan 12 2007 Ben Konrath 3.3.0-0.2.M4
-- Pull in fixes from rawhide.
-
-* Wed Dec 20 2006 Ben Konrath 3.3.0-0.1.M4
-- 3.3M4.
-- Update patches for 3.3M4.
-- Remove SWT JNI symlinks in %%{_libdir}.
-
-* Wed Dec 6 2006 Ben Konrath 3.2.1-25
-- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
-- Resolves: #211008.
-
-* Tue Dec 5 2006 Andrew Overholt 3.2.1-24
-- Specfile review with Ben Konrath.
-- Lots of cleanups.
-
-* Tue Nov 28 2006 Andrew Overholt 3.2.1-23
-- Move back to ~/.eclipse for update site pending upstream comments.
-- Add patch to add platform to ~/.eclipse's platform.xml. This maintains
- user-installed plugins but allows us to remove the pre-configured
- platform.xml in the OSGi configuration area.
-
-* Mon Nov 20 2006 Andrew Overholt 3.2.1-22
-- Use ~/.eclipseplugins instead of ~/.eclipse in update site - homedir patch.
-- Bump release.
-
-* Fri Nov 17 2006 Ben Konrath 3.2.1-21
-- Add patch to workaround an xml parsing bug in libgcj (gcc bug #29853).
-- Resolves: #209393.
-
-* Fri Nov 17 2006 Andrew Overholt 3.2.1-20
-- Revise gre64 patch to just do ppc64 addition and not ordering change.
-
-* Thu Nov 16 2006 Andrew Overholt 3.2.1-19
-- Add patch to look at gre64.conf on ppc64.
-
-* Fri Nov 10 2006 Ben Konrath 3.2.1-18
-- Remove SWT ON_TOP patch as it is fixed in 3.2.1.
-
-* Thu Nov 09 2006 Ben Konrath 3.2.1-17
-- Add file level requirement for swt fragment to rcp and platform packages.
- This is needed so that the rcp and platform packages pull in the swt package
- of the correct word size.
-
-* Mon Nov 06 2006 Ben Konrath 3.2.1-16
-- Move copy-platform back to %%{_datadir}/eclipse.
-- Require gjdoc >= 0.7.7-14 as it generates consistent html across archs.
-- Move most of the doc plugins back to %%{_datatdir}/eclipse now that gjdoc
- is fixed.
-
-* Fri Nov 03 2006 Andrew Overholt 3.2.1-15
-- Make sdk require config.ini itself rather than the package to deal with the
- bi-arch installation situation.
-- Move sdk feature and plugin to %%{_libdir} so we can check for its existence
- in the post scripts.
-
-* Thu Nov 02 2006 Andrew Overholt 3.2.1-14
-- Remove post sections that munge eclipse.product; always set it to
- org.eclipse.platform.ide or org.eclipse.sdk.ide.
-- Remove changelogs prior to 3.2.0.
-
-* Thu Nov 02 2006 Ben Konrath 3.2.1-12
-- Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being
- generated differently on different arches.
-- Fix multilib problem when there are two or more jars within a jar.
-- BR dos2unix always (for mac2unix).
-
-* Wed Nov 01 2006 Ben Konrath 3.2.1-11
-- Move copy-platform to %%{_libdir}/eclipse
-- Move the platform.source, icu4j, icu4j.source, help.webapp and
- update.core.linux plugins to %%{_libdir}/eclipse/plugins because these plugins
- have platform specific content. Some of the platform specific content may be
- a result of bugs in libgcj. These need to be investigated.
-- Disable building the help indexes on all archs so that we have the same doc
- plugins on all archs.
-- Remove org.apache.ant_1.6.5/bin/runant.py to avoid multilib conflicts.
-- Repack all the jars and the jars within those jars. This is needed
- to make this package multilib compatible.
-- Put SWT symlinks in %%{_libdir}/eclipse instead of
- %%{_libdir}/eclipse/plugins.
-
-* Wed Nov 01 2006 Andrew Overholt 3.2.1-11
-- Use equinox initializer instead of old patch to core.runtime.
-- Run initializer *after* splitting install into arch-specific and
- arch-independent locations.
-- Move copy-platform to arch-specific location.
-- Get rid of broken symlinks in tomcat plugin.
-
-* Tue Oct 31 2006 Andrew Overholt 3.2.1-11
-- Fix copy-platform to work with split install.
-
-* Tue Oct 31 2006 Ben Konrath 3.2.1-10
-- Add 3.2.1 splash screen.
-- Sort the java source files before building (#209249).
-- Remove Fedora ifdefs.
-- Resolves: #209249.
-
-* Tue Oct 31 2006 Ben Konrath 3.2.1-9
-- Re-enable building of the icu4j plugins.
-
-* Mon Oct 30 2006 Ben Konrath 3.2.1-8
-- Temporarily disable building of icu4j plugin.
-
-* Mon Oct 30 2006 Andrew Overholt 3.2.1-8
-- Fix eclipse-ecj symlink to point to correct location.
-- Put SWT symlinks in %%{_libdir} instead of %%{_datadir} as they're
- target-dependent.
-
-* Sat Oct 28 2006 Ben Konrath 3.2.1-7
-- Add patch for ecj [] classpath problem.
-- Remove configuration files from rcp files list.
-- Add patch set bindir and shared config patch to allow the eclipse binary
- to sit in %%{_bindir} and remove the symlinks. This patch also allows us to
- set osgi.sharedConfiguration.area config on a per build basis so that the
- configuration directory can be arch dependant.
-- Remove launcher link patch as the bindir patch removes the requirement for
- this patch.
-- Don't aot-compile org.eclipse.ui.ide to work around rh bug # 175547.
-- Add Requies(post,postun) to all packages to ensure that no files are left
- behind when eclipse is un-installed.
-- Many spec file clean ups.
-- Resolves: #199961, #202585, #210764, #207016.
-- Related: #175547.
-
-* Mon Oct 16 2006 Andrew Overholt 3.2.1-6
-- Remove unneeded tomcat symlinks.
-
-* Mon Oct 16 2006 Andrew Overholt