mbooth pushed to eclipse (master). "Update to latest I-build (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 21:03:29 UTC 2015
>From f23ad578dee5fe19c1cc47027f889e86b4c213b8 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Wed, 8 Apr 2015 17:02:27 +0100
Subject: Update to latest I-build
- Update eclipse-build snapshot
- Simplify installation of PDE build scripts
- Drop upstreamed hamcrest patch
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 54c755d..1e33c97 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -50,7 +50,7 @@
version="0.0.0" />
<feature
@@ -37,9 +28,6 @@
- id="org.eclipse.e4.core.tools.feature"
+ id="org.eclipse.e4.core.tools.feature.source"
version="0.0.0" />
<feature
- id="org.eclipse.osgi.compatibility.plugins.feature"
diff --git a/eclipse-direct-hamcrest-use.patch b/eclipse-direct-hamcrest-use.patch
deleted file mode 100644
index ba1fcb5..0000000
--- a/eclipse-direct-hamcrest-use.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF.orig 2015-01-19 15:56:18.531142605 +0000
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF 2015-01-19 15:58:03.632681385 +0000
-@@ -28,7 +28,8 @@
- org.eclipse.equinox.p2.publisher;bundle-version="1.0.0",
- org.easymock;bundle-version="2.4.0",
- org.eclipse.equinox.frameworkadmin.test;bundle-version="1.0.0",
-- org.junit;bundle-version="4.8.0",
-+ org.junit,
-+ org.hamcrest.core,
- org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",
- org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",
diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index 61ea200..67f669d 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -22,7 +22,7 @@
+ org.hamcrest.core,
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
--- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig 2014-04-22 14:31:35.155774270 +0100
+++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF 2014-04-22 14:33:47.599498477 +0100
@@ -36,7 +36,7 @@
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200"
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig 2014-03-26 11:39:33.756282231 +0000
+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml 2014-03-26 13:03:00.971974954 +0000
@@ -469,13 +469,6 @@
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 61b821d..6b726ec 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -182,10 +182,11 @@
generatedVersionLength=45
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
-@@ -54,6 +54,29 @@
+@@ -54,6 +54,30 @@
<plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
++ <plugin id="org.apache.commons.jxpath" />
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
+ <plugin id="org.apache.felix.gogo.command" />
+ <plugin id="org.apache.batik.css" />
diff --git a/eclipse.spec b/eclipse.spec
index 275d3ae..890f4f0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -11,8 +11,8 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 5
%global eclipse_micro 0
-%global eb_commit 0d6b8462556b99e3cd5abec65595efbcf37707d2
-%global eclipse_tag I20150331-0800
+%global eb_commit 40424d338dc6c438c6331d4634d3d8c5104261fc
+%global eclipse_tag I20150408-1100
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.2.9
@@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.12.git201503310800%{?dist}
+Release: 0.13.git201504081100%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -116,9 +116,6 @@ Patch20: %{pkg_name}-support-symlink-bundles.patch
# -org.w3c.dom.smil
Patch21: %{pkg_name}-feature-plugins-to-category-ius.patch
-# Require hamcrest when using directly (cannot rely on junit reexporting it)
-Patch22: eclipse-direct-hamcrest-use.patch
-
BuildRequires: rsync
BuildRequires: make, gcc
BuildRequires: gtk2-devel
@@ -143,7 +140,8 @@ BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testuti
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-commons-codec
+BuildRequires: apache-commons-jxpath
BuildRequires: felix-gogo-command >= 0.14.0-2
BuildRequires: felix-gogo-shell >= 0.10.0-3
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
@@ -219,7 +217,8 @@ Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-r
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
Requires: apache-commons-el >= 1.0-23
Requires: apache-commons-logging
-Requires: apache-commons-codec >= 1.6-2
+Requires: apache-commons-codec
+Requires: apache-commons-jxpath
Requires: felix-gogo-command >= 0.14.0-2
Requires: felix-gogo-shell >= 0.10.0-3
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
@@ -339,7 +338,6 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch19
%patch20
%patch21
-%patch22
# 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
@@ -410,9 +408,6 @@ done
%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
%pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt
-# This plugin is already specified in the parent pom
-%pom_remove_plugin "org.eclipse.tycho:tycho-packaging-plugin" eclipse.platform.ui.tools
-
# This part generates secondary fragments using primary fragments
for dir in eclipse.platform.swt.binaries/bundles \
rt.equinox.framework/bundles rt.equinox.binaries ; do
@@ -615,8 +610,8 @@ ln -s /usr/share/icons/hicolor/256x256/apps/%{name}.png \
# Install desktop file
%{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop}
-%{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktopintegration/eclipse.desktop}
%{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktopintegration/eclipse.desktop}
+sed -i -e 's/Icon=eclipse/Icon=%{name}/g' desktopintegration/eclipse.desktop
install -m644 -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
@@ -625,9 +620,6 @@ install -m644 -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT%{_d
install -m644 -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-jdt.metainfo.xml
install -m644 -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-pde.metainfo.xml
-#################################
-### Extraced from old build.xml #
-#################################
LOCAL_PWD=`pwd`
#change the installation p2 files
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide/linux/gtk/%{eclipse_arch}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/
@@ -669,9 +661,6 @@ popd
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
ln -s %{_libdir}/%{pkg_name}/eclipse.ini
popd
-#################################
-### End of extraction #
-#################################
# List jars to be symlinked into javadir
pushd $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins
@@ -700,19 +689,15 @@ done
%add_maven_depmap JPP.eclipse-osgi.util.pom %{pkg_name}/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi
%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{pkg_name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
-# 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
-sed -i -e "s|@DATADIR@|%{_datadir}|g" copy-platform
-mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
+# Install the Copy Platform script
+install -p -D -m0755 pdebuildscripts/eclipse-copy-platform.sh \
+ $RPM_BUILD_ROOT%{_libdir}/eclipse/buildscripts/copy-platform
+sed -i -e "s|@DATADIR@|%{_datadir}|g" \
+ $RPM_BUILD_ROOT%{_libdir}/eclipse/buildscripts/copy-platform
-# Install the PDE Build wrapper script.
+# Install the PDE Build wrapper script
install -p -D -m0755 pdebuildscripts/eclipse-pdebuild.sh \
- $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild
-PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins \
- | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
-sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
- $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild
+ $RPM_BUILD_ROOT%{_bindir}/eclipse-pdebuild
sed -i "s|@LIBDIR@|%{_libdir}|g" \
$RPM_BUILD_ROOT%{_bindir}/eclipse-pdebuild
@@ -830,6 +815,7 @@ fi
%{_libdir}/%{pkg_name}/features/org.eclipse.core.runtime.feature_*
%{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.core.feature_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.help_*
%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
@@ -843,9 +829,12 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.css_*
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util.gui_*
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util_*
-%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_*
%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpclient_*
%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpcore_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.beanutils_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.collections_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.jxpath_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.logging_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_*
@@ -854,6 +843,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.core_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.analysis_*
+%{_libdir}/%{pkg_name}/plugins/org.jdom_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_*
@@ -908,9 +898,11 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench.texteditor_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.commands_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.contexts_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.di.annotations_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.di.extensions_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.di_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.services_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.emf.xpath_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.bindings_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
@@ -932,7 +924,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}/features/org.eclipse.help_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
@@ -1036,6 +1027,12 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
+* Wed Apr 08 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.13.git201504081100
+- Update to latest I-build
+- Update eclipse-build snapshot
+- Simplify installation of PDE build scripts
+- Drop upstreamed hamcrest patch
+
* Wed Apr 01 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.12.git201503310800
- Organise patches
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 068f612..699a869 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=I20150331-0800
+TAG=I20150408-1100
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 7038b25..0a0df81 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d3bdf45748f2229d6db96f51fd842bc3 org.eclipse.linuxtools.eclipse-build-0d6b8462556b99e3cd5abec65595efbcf37707d2.tar.bz2
-54aba473e15c70254418189df21df805 R4_platform-aggregator-I20150331-0800.tar.xz
+9087b88ce6471a0cd08f659e25c5ac75 org.eclipse.linuxtools.eclipse-build-40424d338dc6c438c6331d4634d3d8c5104261fc.tar.bz2
+eea19d91b2a2c53aa055ae189f735793 R4_platform-aggregator-I20150408-1100.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=master&id=f23ad578dee5fe19c1cc47027f889e86b4c213b8
More information about the scm-commits
mailing list