[eclipse] Update eclipse-build snapshot

Fri Nov 28 13:18:38 UTC 2014

commit ee10ab0a9d6e54fb3553f72c24e7f0a2061be9fa
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Nov 28 13:18:20 2014 +0000

    Update eclipse-build snapshot
    
    - Rebuild for ECF symlink changes

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

diff --git a/eclipse.spec b/eclipse.spec
index a1981e2..422bcc3 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       1657ba33e00538be37c248c0694e1e40f1a0022f
+%global eb_commit       2135919f7f0f11f3c43901b8e70819c9a4911ac3
 %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:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -164,7 +164,7 @@ BuildRequires: %{?scl_prefix}lucene-core >= 4.10.2
 BuildRequires: %{?scl_prefix}lucene-analysis >= 4.10.2
 BuildRequires: junit >= 4.10-5
 BuildRequires: hamcrest >= 0:1.1-11
-BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
+BuildRequires: sat4j >= 2.3.5-1
 BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.2-2
 BuildRequires: zip
 BuildRequires: sac >= 1.3-12
@@ -173,7 +173,7 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-6
 BuildRequires: tycho >= 0.19
 BuildRequires: tycho-extras >= 0.19
-BuildRequires: eclipse-ecf-core >= 3.9.0-2
+BuildRequires: eclipse-ecf-core >= 3.9.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
@@ -235,13 +235,13 @@ Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
 Requires: jsch >= 0.1.46-2
 Requires: %{?scl_prefix}lucene-core >= 4.10.2
 Requires: %{?scl_prefix}lucene-analysis >= 4.10.2
-Requires: %{?scl_prefix}sat4j >= 2.3.5-1
+Requires: sat4j >= 2.3.5-1
 Requires: sac >= 1.3-12
 Requires: batik >= 1.8
 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-ecf-core >= 3.9.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
@@ -534,8 +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.*
+# EMF and ECF are packaged separately
+rm -rf features/org.eclipse.emf.* plugins/org.eclipse.emf.* \
+  features/org.eclipse.ecf.* plugins/org.eclipse.ecf.* plugins/org.eclipse.ecf_*
 
 #delete all local repositories. We want to have only "original" by default.
 pushd p2/org.eclipse.equinox.p2.engine/.settings
@@ -565,7 +566,7 @@ cat >> eclipse.ini <<EOF
 -XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
 -XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
 -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
--Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{?_scl_root}/usr/share/eclipse/dropins
+-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
 -Declipse.p2.skipMovedInstallDetection=true
 EOF
 
@@ -935,20 +936,6 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.security.ui_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director.app_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.core.feature_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.core.ssl.feature_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.feature_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.httpclient4.feature_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.ecf.filetransfer.ssl.feature_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.ssl_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.filetransfer_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.identity_*
 %{_libdir}/%{pkg_name}/plugins/org.sat4j.core_*
 %{_libdir}/%{pkg_name}/plugins/org.sat4j.pb_*
 %{_libdir}/%{pkg_name}/plugins/org.w3c.css.sac_*
@@ -1017,6 +1004,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Thu Nov 27 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-11
+- Update eclipse-build snapshot
+- Rebuild for ECF symlink changes
+
 * 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
diff --git a/sources b/sources
index bd4a4ef..d96c09f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 0d857f3b64931672dca62142d7fbdbd0  R4_platform-aggregator-R4_4_1.tar.xz
-0042847a2500342d75b5827a4c794672  org.eclipse.linuxtools.eclipse-build-1657ba33e00538be37c248c0694e1e40f1a0022f.tar.bz2
+4c99218a93f07f77d356c9bf06ee1cce  org.eclipse.linuxtools.eclipse-build-2135919f7f0f11f3c43901b8e70819c9a4911ac3.tar.bz2
