[eclipse] Update to latest I-build

Thu Feb 19 15:14:28 UTC 2015

commit db2abf334d5bd9480c3824b5c1a2ca0ce9f919fc
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Feb 19 15:13:45 2015 +0000

    Update to latest I-build
    
    - Unbundle third party libs from tests subpackage rhbz#1150185
    - Rebuild for new eclipse-ecf/httpcomponents

 eclipse.spec   | 44 ++++++++++++++++++++++++++++----------------
 get-eclipse.sh |  2 +-
 2 files changed, 29 insertions(+), 17 deletions(-)
---

diff --git a/eclipse.spec b/eclipse.spec
index f792257..5840ed7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -13,7 +13,7 @@ Epoch:                  1
 %global eclipse_minor   5
 %global eclipse_micro   0
 %global eb_commit       2775b93d3d9f147f5711c91bb3aa623f2582019d
-%global eclipse_tag     I20150210-0800
+%global eclipse_tag     I20150217-0800
 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
 %global _jetty_version  9.2.7
 
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.1.git201502100800%{?dist}
+Release:        0.2.git201502170800%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -164,18 +164,19 @@ BuildRequires: zip
 BuildRequires: sac >= 1.3-12
 BuildRequires: batik-css >= 1.8-0.17
 BuildRequires: xml-commons-apis >= 1.4.01-12
-BuildRequires: atinject >= 1-6
+BuildRequires: atinject >= 1-18
+BuildRequires: atinject-tck >= 1-18
 BuildRequires: tycho >= 0.22
 BuildRequires: tycho-extras >= 0.22
-BuildRequires: eclipse-ecf-core >= 3.9.2-1
+BuildRequires: eclipse-ecf-core >= 3.9.2-2
 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
 BuildRequires: cbi-plugins
 BuildRequires: xml-maven-plugin
-BuildRequires: httpcomponents-core
-BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core >= 4.4-1
+BuildRequires: httpcomponents-client >= 4.4-1
 BuildRequires: mockito
 %if ! %{bootstrap}
 BuildRequires: eclipse-pde
@@ -231,9 +232,9 @@ Requires: sat4j >= 2.3.5-1
 Requires: sac >= 1.3-12
 Requires: batik-css >= 1.8-0.17
 Requires: xml-commons-apis >= 1.4.01-12
-Requires: atinject >= 1-6
+Requires: atinject >= 1-18
 Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core >= 3.9.2-1
+Requires: eclipse-ecf-core >= 3.9.2-2
 Requires: eclipse-emf-core >= 1:2.10.1-3
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
@@ -241,8 +242,8 @@ Requires: glassfish-servlet-api >= 3.1.0
 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
-Requires: httpcomponents-client
+Requires: httpcomponents-core >= 4.4-1
+Requires: httpcomponents-client >= 4.4-1
 %{?scl:Requires: %scl_runtime}
 Obsoletes: %{name}-rcp < 1:4.3.0
 Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
@@ -291,6 +292,7 @@ Summary:        Eclipse Tests
 Requires:       %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
 Requires:       easymock3
 Requires:       mockito
+Requires:       atinject-tck >= 1-18
 
 %description    tests
 Eclipse Tests.
@@ -722,17 +724,24 @@ rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
 rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
 
 pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
+ f=`ls | grep -e "^com.google.code.atinject.tck_"`
+ rm -rf $f
+ ln -s %{_javadir}/atinject-tck.jar ${f%.jar}.jar
  f=`ls | grep -e "^org.easymock_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/easymock.jar ${f%.jar}.jar
  f=`ls | grep -e "^org.mockito.mockito-core_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/mockito.jar ${f%.jar}.jar
  f=`ls | grep -e "^org.objenesis_"`
- rm -rf $f 
+ rm -rf $f
  ln -s %{_javadir}/objenesis/objenesis.jar ${f%.jar}.jar
+ for ham in core text library integration ; do
+  f=`ls | grep -e "^org.hamcrest.${ham}_"`
+  rm -rf $f
+  ln -s %{_javadir}/hamcrest/${ham}.jar ${f%.jar}.jar
+ done
  # These are already present in the platform
- rm -rf org.hamcrest.core_*
  rm -rf org.junit_*
 popd
 
@@ -805,7 +814,6 @@ fi
 %{_libdir}/%{pkg_name}/features/org.eclipse.equinox.core.feature_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
 %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
 %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
@@ -924,7 +932,6 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.console_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ql_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.operations_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui_*
@@ -1010,6 +1017,11 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Feb 18 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.2.git201502170800
+- Update to latest I-build
+- Unbundle third party libs from tests subpackage rhbz#1150185
+- Rebuild for new eclipse-ecf/httpcomponents
+
 * Fri Jan 30 2015 Mat Booth <mat.booth at redhat.com> - 1:4.5.0-0.1.git201502100800
 - Update to latest 4.5.0 I-build
 - Drop upstreamed jetty9/servlet and workspace picker patches
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 784320e..63da26d 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=I20150210-0800
+TAG=I20150217-0800
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
