From ab94e592e247eb54dc3b2e8614419f7c60f858d1 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Apr 23 2012 10:58:22 +0000
Subject: Partial work (for testing, the jdt issue is not fixed yet), but s390

support needs to be tested ASAP.
---

diff --git a/eclipse.spec b/eclipse.spec
index 978df6c..9de8c07 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@ Epoch:  1
 %global eclipse_micro   0
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         f4bba5a2c27a4634da8ed47db8f6c4c190e18db1
+%global eb_sha1         fb5b64e892feb12fbe828fc8b0eb119857ab1058
 %global build_id        I20120417-1000
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global emf_version     2.8.0
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.16.I201204171000%{?dist}
+Release:        0.17.I201204171000%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -72,7 +72,7 @@ BuildRequires: jetty >= 8.1.0-1
 BuildRequires: lucene >= 2.9.4-8
 BuildRequires: lucene-contrib >= 2.9.4-8
 BuildRequires: junit >= 4.10-4
-BuildRequires: hamcrest >= 0:1.1-9.2
+BuildRequires: hamcrest >= 0:1.1-11
 BuildRequires: sat4j >= 2.3.0-1
 BuildRequires: objectweb-asm >= 3.3.1-1
 BuildRequires: zip
@@ -167,7 +167,7 @@ Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release}
 Requires:       junit >= 4.10-4
 Requires:       jakarta-commons-httpclient >= 1:3.1-7
-Requires:       hamcrest >= 0:1.1-9.2
+Requires:       hamcrest >= 0:1.1-11
 Requires:       java-javadoc >= 1:1.7.0
 
 
@@ -353,6 +353,9 @@ install -p -D -m0755 %{SOURCE9} \
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
+# Remove the junit library duplicated by pdebuild.
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins/junit_4.8.2.v4_8_2_v20110321-1705.jar
+
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -662,6 +665,11 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Mon Apr 23 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.17.I201204171000
+- Remove duplicated junit library.
+- Initial s390 and s390x support.
+- Update to latest eclipse-build.
+
 * Fri Apr 20 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.16.I201204171000
 - Bug 814332 - Documentation is not pointing to locally installed javadoc. 
 
diff --git a/sources b/sources
index 2b6a57b..e6100b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-96e3f899ab5ef9b89be4aea5c8d47ff0  eclipse-build-f4bba5a2c27a4634da8ed47db8f6c4c190e18db1.tar.xz
+029f2e3ae3f4e2385b46a84e35b3d4f4  eclipse-build-fb5b64e892feb12fbe828fc8b0eb119857ab1058.tar.xz
 f960cfebf112a238b41719b2254cd399  eclipse-4.2.0-I20120417-1000-src.tar.bz2