rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to latest I-build of Luna 4.4.0 

- Don't unnecessarily create platform specific fragments for o.e.core.net and
  o.e.core.filesystem.
- Accomodate for ppc64le architecture.
- Drop upstreamed patch: objectweb-asm
This commit is contained in:
Mat Booth 2014-04-09 14:40:35 +01:00
parent 974ce9f47e
commit 7e377c3611
8 changed files with 71 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
eclipse-change-build-packagings.patch
View File

@ -20,14 +20,6 @@
<configIni use="default">
</configIni>
@@ -167,6 +167,7 @@
<feature id="org.eclipse.rcp.configuration"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
+ <feature id="org.eclipse.cvs"/>
</features>
<configurations>
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig 2014-03-12 10:25:46.000000000 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2014-03-12 12:17:01.625708314 +0000
@@ -34,5 +34,6 @@
@ -37,19 +29,6 @@
+ <module>jdtpde</module>
</modules>
</project>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig 2014-03-12 12:17:01.625708314 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2014-03-12 12:58:21.458878371 +0000
@@ -566,4 +566,10 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.jdt.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
--- eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml.orig 2014-03-25 11:20:26.959967304 +0000
+++ eclipse.platform.releng.tychoeclipsebuilder/jdtpde/pom.xml 2014-03-25 11:20:41.710980911 +0000
@@ -17,11 +17,11 @@
@ -66,9 +45,9 @@
+ <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-01 15:46:22.356772259 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-01 15:46:37.124510818 +0100
@@ -19,10 +19,10 @@
--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100
@@ -19,7 +19,7 @@
%license
</license>
@ -76,11 +55,16 @@
+ <!--requires>
<import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
@@ -29,7 +29,7 @@
<import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
- </requires>
+ </requires-->
<!--
<import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig 2014-04-01 16:47:57.604505297 +0100
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2014-04-01 16:48:09.628288129 +0100
@@ -85,13 +85,6 @@

6
eclipse-help-doc-adjust-dependencies.patch
View File

@ -29,12 +29,12 @@ index 0af7e6b..1985d9e 100644
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
- org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
- org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)"
- org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)",
+ org.apache.lucene.analysis;bundle-version="[3.5.0,5.0.0)",
+ org.apache.lucene.core;bundle-version="[3.5.0,5.0.0)"
+ org.apache.lucene.core;bundle-version="[3.5.0,5.0.0)",
org.eclipse.core.net;bundle-version="1.2.200"
Import-Package: com.ibm.icu.text,
org.eclipse.equinox.http.jetty;resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 12beb8e..e20ea19 100644
--- a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF

17
eclipse-no-source-for-dependencies.patch
View File

@ -44,17 +44,18 @@
</plugin>
--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak 2013-01-29 11:22:47.065953870 +0100
+++ eclipse.pde/org.eclipse.pde-feature/pom.xml 2013-01-29 11:23:18.630196529 +0100
@@ -37,6 +37,7 @@
@@ -37,6 +37,8 @@
<configuration>
<excludes>
<plugin id="org.eclipse.pde"/>
+ <plugin id="org.objectweb.asm.all"/>
+ <plugin id="org.objectweb.asm"/>
+ <plugin id="org.objectweb.asm.tree"/>
<plugin id="org.eclipse.pde.doc.user"/>
</excludes>
</configuration>
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
@@ -59,6 +59,8 @@
@@ -57,6 +57,8 @@
<excludes>
<plugin id="org.eclipse.jdt"/>
<plugin id="org.eclipse.jdt.doc.user"/>
@ -103,30 +104,26 @@
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
+
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="javax.inject" />
+ <plugin id="com.ibm.icu"/>
+ <plugin id="org.apache.felix.gogo.runtime" />
+ <plugin id="org.apache.felix.gogo.shell" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
+ <plugin id="org.apache.felix.gogo.shell" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" />
</excludes>
</configuration>
</execution>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-03-24 12:58:43.355826288 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-03-24 13:04:46.463916138 +0000
@@ -75,6 +75,12 @@
@@ -75,6 +75,8 @@
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
<plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="org.apache.ant"/>
+ <plugin id="org.eclipse.core.filesystem.linux.arm"/>
+ <plugin id="org.eclipse.core.filesystem.linux.aarch64"/>
+ <plugin id="org.eclipse.core.filesystem.linux.s390"/>
+ <plugin id="org.eclipse.core.filesystem.linux.s390x"/>
</excludes>
</configuration>
</execution>

48
eclipse-objectweb-asm-all.patch
View File

@ -1,48 +0,0 @@
diff -ur eclipse.pde/org.eclipse.pde-feature/feature.xml eclipse.pde/org.eclipse.pde-feature/feature.xml
--- eclipse.pde/org.eclipse.pde-feature/feature.xml 2014-04-01 22:00:14.000000000 +0100
+++ eclipse.pde/org.eclipse.pde-feature/feature.xml 2014-04-02 16:09:47.877543514 +0100
@@ -82,7 +82,7 @@
unpack="false"/>
<plugin
- id="org.objectweb.asm"
+ id="org.objectweb.asm.all"
download-size="0"
install-size="0"
version="0.0.0"
diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF 2014-04-01 22:03:06.000000000 +0100
+++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF 2014-04-02 16:08:09.390359775 +0100
@@ -14,7 +14,7 @@
org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ant.core;bundle-version="[3.1.300,4.0.0)",
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)",
+ org.objectweb.asm.all;bundle-version="[5.0.1,6.0.0)",
org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF
--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF 2014-04-01 22:03:05.000000000 +0100
+++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF 2014-04-02 16:08:09.390359775 +0100
@@ -5,7 +5,7 @@
Bundle-Version: 1.0.200.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.objectweb.asm;bundle-version="[5.0.0,6.0.0)",
+Require-Bundle: org.objectweb.asm.all;bundle-version="[5.0.0,6.0.0)",
org.eclipse.pde.api.tools;bundle-version="[1.0.600,2.0.0)",
org.eclipse.jdt.core;bundle-version="[3.8.1,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)"
diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF 2014-04-01 22:03:05.000000000 +0100
+++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF 2014-04-02 16:08:09.390359775 +0100
@@ -22,7 +22,7 @@
org.eclipse.jdt.core.tests.builder;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jdt.core.tests.compiler;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ant.core,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)",
+ org.objectweb.asm.all;bundle-version="[5.0.1,6.0.0)",
org.eclipse.jface;bundle-version="3.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.pde.api.tools.anttasks.tests,

197
eclipse-secondary-arches.patch
View File

@ -2,7 +2,7 @@ diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 6c567f8..969eafb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -209,29 +209,14 @@
@@ -209,29 +209,19 @@
<arch>x86_64</arch>
</environment>
<environment>
@ -24,10 +24,12 @@ index 6c567f8..969eafb 100644
</environment>
<environment>
- <os>aix</os>
- <ws>gtk</ws>
+ <os>linux</os>
<ws>gtk</ws>
- <arch>ppc</arch>
- </environment>
- <environment>
+ <arch>ppc64le</arch>
</environment>
<environment>
- <os>aix</os>
+ <os>linux</os>
<ws>gtk</ws>
@ -100,166 +102,17 @@ index bb03da8..257d417 100644
<execution>
<id>copy-resources-gtk.linux.x86</id>
<phase>validate</phase>
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
index 03bf359..3acacc2 100644
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
@@ -134,8 +134,65 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.net.linux.ppc"
+ os="linux"
+ arch="ppc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
<plugin
+ id="org.eclipse.core.net.linux.ppc64"
+ os="linux"
+ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.net.linux.arm"
+ os="linux"
+ arch="arm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.core.net.linux.aarch64"
+ os="linux"
+ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.core.net.linux.s390"
+ os="linux"
+ arch="s390"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.core.net.linux.s390x"
+ os="linux"
+ arch="s390x"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.core.resources"
download-size="0"
install-size="0"
@@ -405,7 +462,64 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.core.filesystem.linux.ppc"
+ os="linux"
+ arch="ppc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+<plugin
+ id="org.eclipse.core.filesystem.linux.ppc64"
+ os="linux"
+ arch="ppc64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.core.filesystem.linux.s390"
+ os="linux"
+ arch="s390"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+<plugin
+ id="org.eclipse.core.filesystem.linux.s390x"
+ os="linux"
+ arch="s390x"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+<plugin
+ id="org.eclipse.core.filesystem.linux.arm"
+ os="linux"
+ arch="arm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+<plugin
+ id="org.eclipse.core.filesystem.linux.aarch64"
+ os="linux"
+ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
<plugin
id="org.eclipse.core.filesystem.linux.x86_64"
os="linux"
diff --git a/eclipse.platform.resources/pom.xml b/eclipse.platform.resources/pom.xml
index 4b33285..f522167 100644
--- a/eclipse.platform.resources/pom.xml
+++ b/eclipse.platform.resources/pom.xml
@@ -43,6 +43,10 @@
<modules>
<module>bundles/org.eclipse.core.filesystem</module>
+ <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
+ <module>bundles/org.eclipse.core.filesystem.linux.aarch64</module>
+ <module>bundles/org.eclipse.core.filesystem.linux.s390</module>
+ <module>bundles/org.eclipse.core.filesystem.linux.s390x</module>
<module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
<module>bundles/org.eclipse.core.filesystem.linux.ppc64</module>
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
@@ -53,6 +53,8 @@
@@ -53,6 +53,9 @@
<module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+ <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
<module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
@ -267,31 +120,15 @@ diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/ec
index f5fb504..1187e84 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
@@ -429,6 +429,7 @@
@@ -429,6 +429,8 @@
<equals arg1="${swt.arch}" arg2="ia64"/>
<equals arg1="${swt.arch}" arg2="ppc64"/>
<equals arg1="${swt.arch}" arg2="s390x"/>
+ <equals arg1="${swt.arch}" arg2="aarch64"/>
+ <equals arg1="${swt.arch}" arg2="ppc64le"/>
</or>
</condition>
<echo>Is64=${is64}</echo>
diff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml
index 8637ed3..e36538a 100644
--- a/eclipse.platform.team/pom.xml
+++ b/eclipse.platform.team/pom.xml
@@ -63,6 +63,12 @@
<module>features/org.eclipse.cvs-feature</module>
<!-- creatively located fragments -->
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm</module>
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.aarch64</module>
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc</module>
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64</module>
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390</module>
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x</module>
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
@ -302,10 +139,10 @@ index 7e1f520..734dd10 100644
fragment="true"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
+ os="linux"
+ ws="gtk"
+ arch="ppc"
+ arch="ppc64le"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
@ -333,23 +170,22 @@ index 7e1f520..734dd10 100644
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
@@ -594,6 +624,40 @@
@@ -594,6 +624,39 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.ppc"
+ id="org.eclipse.swt.gtk.linux.ppc64le"
+ os="linux"
+ ws="gtk"
+ arch="ppc"
+ arch="ppc64le"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.arm"
+ os="linux"
@ -625,12 +461,13 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
@@ -55,6 +55,8 @@
@@ -55,6 +55,9 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>

66
eclipse.spec
View File

@ -15,8 +15,8 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
%global eb_commit f2f26a0c09e466a2f7ad870ee99d61fb5c562c6c
%global eclipse_tag I20140401-1500
%global eb_commit 7923630a54ee16ba70e90b11ac3184cab5f306fb
%global eclipse_tag I20140408-1645
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@ -24,15 +24,15 @@ Epoch: 1
%{?scl:%global _jetty_version 8}
%ifarch %{ix86}
%define eclipse_arch x86
%define eclipse_arch x86
%endif
%ifarch %{arm}
%define eclipse_arch arm
%endif
%ifarch %{power64}
%ifarch ppc64 ppc64p7
%define eclipse_arch ppc64
%endif
%ifarch s390 s390x ppc x86_64 aarch64
%ifarch s390 s390x ppc x86_64 aarch64 ppc64le
%define eclipse_arch %{_arch}
%endif
@ -44,7 +44,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.7.git201404011500%{?dist}
Release: 0.8.git201404081645%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -118,10 +118,6 @@ Patch22: %{pkg_name}-mockito.patch
Patch23: %{pkg_name}-policy-comparators.patch
# org.objectweb.asm -> org.objectweb.asm.all
Patch24: %{pkg_name}-objectweb-asm-all.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: make, gcc
BuildRequires: gtk2-devel
@ -157,8 +153,8 @@ BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
BuildRequires: lucene-core >= 4.7.0-7
BuildRequires: lucene-analysis >= 4.7.0-7
BuildRequires: lucene-core >= 4.7.1-1
BuildRequires: lucene-analysis >= 4.7.1-1
BuildRequires: junit >= 4.10-5
BuildRequires: hamcrest >= 0:1.1-11
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
@ -235,8 +231,8 @@ Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
Requires: jsch >= 0.1.46-2
Requires: lucene-core >= 4.7.0-7
Requires: lucene-analysis >= 4.7.0-7
Requires: lucene-core >= 4.7.1-1
Requires: lucene-analysis >= 4.7.1-1
Requires: %{?scl_prefix}sat4j >= 2.3.5-1
Requires: sac >= 1.3-12
Requires: xml-commons-apis >= 1.4.01-12
@ -331,7 +327,6 @@ popd
%patch21
%patch22
%patch23
%patch24
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@ -382,11 +377,9 @@ popd
# This part generates secondary fragments using primary fragments
for dir in eclipse.platform.swt.binaries/bundles \
eclipse.platform.resources/bundles \
eclipse.platform.team/bundles/org.eclipse.core.net/fragments \
rt.equinox.framework/bundles rt.equinox.binaries ; do
utils/ensure_arch.sh "$dir" x86 arm ppc s390
utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64 s390x
utils/ensure_arch.sh "$dir" x86 arm
utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le
done
#hack - there should be a patch providing a profile for each arch
@ -490,11 +483,11 @@ popd
#in jdt
pushd dropins/jdt/plugins
f=`ls | grep -e "^org.hamcrest.core_"`
rm -f $f
ln -s %{_javadir}/hamcrest/core.jar $f
rm -rf $f
ln -s %{_javadir}/hamcrest/core.jar ${f%.jar}.jar
f=`ls | grep -e "^org.junit_4"`
rm -rf $f
ln -s %{_javadir}/junit.jar $f
ln -s %{_javadir}/junit.jar ${f%.jar}.jar
popd
#clean up
@ -552,6 +545,7 @@ ln -s /usr/share/icons/hicolor/256x256/%{?scl_prefix}apps/eclipse.png \
%{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop}
install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
# Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
@ -617,11 +611,13 @@ popd
# Symlink OSGI jars into javadir
for J in osgi osgi.services osgi.util osgi.compatibility.state equinox.http.servlet jdt.core ; do
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.${J}_*.jar ${J}.jar
DIR=%{?scl: ../../../../}../../../..%{_libdir}/%{pkg_name}
[ -e "`ls $DIR/plugins/org.eclipse.${J}_*.jar`" ] && ln -s $DIR/plugins/org.eclipse.${J}_*.jar ${J}.jar
[ -e "`ls $DIR/dropins/*/plugins/org.eclipse.${J}_*.jar`" ] && ln -s $DIR/dropins/*/plugins/org.eclipse.${J}_*.jar ${J}.jar
popd
VER=$(echo $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
VER=$(echo $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/plugins/org.eclipse.${J}_*.jar | sed -e "s/.*${J}_\(.*\)\.jar/\1/")
sed -i -e "s/@VERSION@/$VER/" externalpoms/org.eclipse.${J}.pom
install -m 0644 externalpoms/org.eclipse.${J}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-${J}.pom
install -m 0644 externalpoms/org.eclipse.${J}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.eclipse-${J}.pom
done
# Install maven depmaps for OSGI jars
@ -632,9 +628,6 @@ done
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{pkg_name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
%add_maven_depmap JPP.eclipse-jdt.core.pom %{pkg_name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jetty.orbit:org.eclipse.jdt.core,org.eclipse.jdt:org.eclipse.jdt.core" -f jdt
# A sanity check.
desktop-file-validate %{buildroot}/usr/share/applications/%{name}.desktop
# Create a script that can be used to make a symlink tree of the
# eclipse platform.
cp -p pdebuildscripts/eclipse-copy-platform.sh copy-platform
@ -642,7 +635,6 @@ sed -i -e "s|@DATADIR@|%{_datadir}|g" copy-platform
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts/copy-platform
# Install the PDE Build wrapper script.
install -p -D -m0755 pdebuildscripts/eclipse-pdebuild.sh \
@ -738,7 +730,6 @@ fi
%{_libdir}/%{pkg_name}/swt.jar
%{_libdir}/../lib/java/swt.jar
%files platform -f .mfiles-platform
%{_bindir}/%{pkg_name}
%{_libdir}/%{pkg_name}/.eclipseproduct
@ -792,6 +783,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.externaltools_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filebuffers_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem.java7_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem.linux.*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.net_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.net.linux.*
@ -800,7 +792,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.variables_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jdt.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.ui_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.common_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.change_*
@ -816,6 +807,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.base_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.ui_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.webapp_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jdt.core.compiler.batch_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jface.text_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jsch.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jsch.ui_*
@ -868,11 +860,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.io_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.security_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.servlet_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.cvs_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.ssh2_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.ui_*
%{_libdir}/%{pkg_name}/features/org.eclipse.cvs_*
%{_libdir}/%{pkg_name}/features/org.eclipse.help_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
@ -985,6 +972,13 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Tue Apr 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.8.git201404081645
- Update to latest I-build of Luna 4.4.0
- Don't unnecessarily create platform specific fragments for o.e.core.net and
o.e.core.filesystem.
- Accomodate for ppc64le architecture.
- Drop upstreamed patch: objectweb-asm
* Thu Apr 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.7.git201404011500
- Fix symlinking junit when it is a directory.

2
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=I20140401-1500
TAG=I20140408-1645
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz

4
sources
View File

@ -1,2 +1,2 @@
622a11663780d1f3d97570328b28f57e org.eclipse.linuxtools.eclipse-build-f2f26a0c09e466a2f7ad870ee99d61fb5c562c6c.tar.bz2
a4727549f2b739c005cb6b7324691014 R4_platform-aggregator-I20140401-1500.tar.xz
ed5ba30c72af1eedd895399c9cf8f463 org.eclipse.linuxtools.eclipse-build-7923630a54ee16ba70e90b11ac3184cab5f306fb.tar.bz2
c3b98ecede19efe44fe8b1150a4cc711 R4_platform-aggregator-I20140408-1645.tar.xz