[eclipse] Update eclipse-build snapshot

Thu Nov 20 18:00:07 UTC 2014

commit ea875ab3899dca03e879353e16a632b7127d491d
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Nov 20 17:59:37 2014 +0000

    Update eclipse-build snapshot
    
    - Rebuild for EMF and icu4j symlink changes
    - Don't own dirs owned by eclipse-filesystem

 eclipse.spec |   42 +++++++++++++++++++-----------------------
 sources      |    2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)
---

diff --git a/eclipse.spec b/eclipse.spec
index 8a1e618..a1981e2 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -12,7 +12,7 @@ Epoch:                  1
 %global eclipse_major   4
 %global eclipse_minor   4
 %global eclipse_micro   1
-%global eb_commit       db6b9cd54787feb7cf7c7a28c80e740340213bd3
+%global eb_commit       1657ba33e00538be37c248c0694e1e40f1a0022f
 %global eclipse_tag     R4_4_1
 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
 %global _jetty_version  9.2.3
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -144,7 +144,7 @@ BuildRequires: webkitgtk-devel
 BuildRequires: webkitgtk4
 BuildRequires: webkitgtk4-devel
 BuildRequires: geronimo-annotation >= 1.0-7
-BuildRequires: %{?scl_prefix}icu4j-eclipse >= 1:54.1.1
+BuildRequires: %{?scl_prefix}icu4j >= 1:54.1.1-2
 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
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
 BuildRequires: jsch >= 0:0.1.46-2
@@ -174,7 +174,7 @@ BuildRequires: atinject >= 1-6
 BuildRequires: tycho >= 0.19
 BuildRequires: tycho-extras >= 0.19
 BuildRequires: eclipse-ecf-core >= 3.9.0-2
-BuildRequires: eclipse-emf-core >= 1:2.10.1-1
+BuildRequires: eclipse-emf-core >= 1:2.10.1-3
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
 BuildRequires: glassfish-jsp >= 2.2.5
 BuildRequires: glassfish-servlet-api >= 3.1.0
@@ -242,11 +242,11 @@ Requires: xml-commons-apis >= 1.4.01-12
 Requires: atinject >= 1-6
 Requires: geronimo-annotation >= 1.0-7
 Requires: eclipse-ecf-core >= 3.9.0-2
-Requires: eclipse-emf-core >= 1:2.10.1-1
+Requires: eclipse-emf-core >= 1:2.10.1-3
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
 Requires: glassfish-servlet-api >= 3.1.0
-Requires: %{?scl_prefix}icu4j-eclipse >= 1:54.1.1
+Requires: %{?scl_prefix}icu4j >= 1:54.1.1-2
 Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
 Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
 Requires: httpcomponents-core
@@ -534,6 +534,9 @@ rm -rf p2/org.eclipse.equinox.p2.core/cache/*
 # no icon needed
 rm -f icon.xpm
 
+# EMF is packaged separately
+rm -rf features/org.eclipse.emf.* plugins/org.eclipse.emf.*
+
 #delete all local repositories. We want to have only "original" by default.
 pushd p2/org.eclipse.equinox.p2.engine/.settings
     sed -i "/repositories\/file/d" *.prefs ../profileRegistry/SDKProfile.profile/.data/.settings/*.prefs
@@ -758,21 +761,18 @@ popd
 find $RPM_BUILD_ROOT/%{_libdir}/eclipse -name *.so -exec chmod a+x {} \;
 
 %post platform
-touch --no-create %{_datadir}/icons/hicolor
+touch --no-create /usr/share/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
 
 %postun platform
-touch --no-create %{_datadir}/icons/hicolor
+touch --no-create /usr/share/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
 
-
 %files swt
-%dir %{_libdir}/%{pkg_name}
-%dir %{_libdir}/%{pkg_name}/plugins
 %{_libdir}/%{pkg_name}/notice.html
 %{_libdir}/%{pkg_name}/eclipse.ini
 %{_libdir}/%{pkg_name}/epl-v10.html
@@ -791,18 +791,13 @@ fi
 /usr/share/icons/*/*/apps/*
 %{_datadir}/appdata/eclipse.appdata.xml
 %{_libdir}/%{pkg_name}/eclipse
-%dir %{_libdir}/%{pkg_name}/dropins
-%dir %{_datadir}/%{pkg_name}/
-%dir %{_datadir}/%{pkg_name}/dropins
 %dir %{_libdir}/%{pkg_name}/configuration/
+%dir %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/
 %{_libdir}/%{pkg_name}/configuration/config.ini
 %{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-%dir %{_libdir}/%{pkg_name}/features/
 %{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
 %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
 %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
@@ -839,10 +834,6 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.core.variables_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.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_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.xmi_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.ds_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.event_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.jetty_*
@@ -1026,6 +1017,11 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Nov 19 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-10
+- Update eclipse-build snapshot
+- Rebuild for EMF and icu4j symlink changes
+- Don't own dirs owned by eclipse-filesystem
+
 * Tue Nov 18 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-9
 - Update dep on icu4j/ECF
 
diff --git a/sources b/sources
index c5242b0..bd4a4ef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 0d857f3b64931672dca62142d7fbdbd0  R4_platform-aggregator-R4_4_1.tar.xz
-b5c946f8de3fb487cf9f385a0ae707e2  org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2
+0042847a2500342d75b5827a4c794672  org.eclipse.linuxtools.eclipse-build-1657ba33e00538be37c248c0694e1e40f1a0022f.tar.bz2
