diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 5481a05..d4a81b4 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -20,14 +20,6 @@
-@@ -167,6 +167,7 @@
-
-
-
-+
-
-
-
--- 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 @@
+ jdtpde
---- 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"/>
-
-+
-
--- 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 @@
+ 4.4.0-SNAPSHOT
eclipse-repository
---- 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
@@ -76,11 +55,16 @@
+
-
-
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.aarch64
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390
-+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x
- bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
- bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
- bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
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"/>
+
+
+
+
+
-+
+ bundles/org.eclipse.equinox.launcher.gtk.aix.ppc
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64
bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64
+ bundles/org.eclipse.equinox.launcher.gtk.linux.arm
+ bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64
++ bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64
bundles/org.eclipse.equinox.launcher.gtk.linux.s390
diff --git a/eclipse.spec b/eclipse.spec
index c08d1eb..b6e8a28 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -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 - 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 - 1:4.4.0-0.7.git201404011500
- Fix symlinking junit when it is a directory.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 0ada48d..d3dbc0c 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -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
diff --git a/sources b/sources
index d55fbfb..500487b 100644
--- a/sources
+++ b/sources
@@ -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