From 0225c6f039ffeeeada920009163fa333f827d206 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 11 2015 14:10:37 +0000
Subject: Non-bootstrap build


- Rebuild for new ECF

---

diff --git a/eclipse.spec b/eclipse.spec
index c7cfc5a..f651b85 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -4,7 +4,7 @@
 # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
 # generation and docs will not be built and a second run will be required, but
 # this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap       1
+%global bootstrap       0
 
 Epoch:                  1
 
@@ -37,7 +37,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        4%{?dist}.2
+Release:        5%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -177,7 +177,7 @@ BuildRequires: atinject-tck >= 1-18
 BuildRequires: tycho >= 0.22.0-15
 BuildRequires: tycho-extras >= 0.22
 BuildRequires: cbi-plugins
-BuildRequires: eclipse-ecf-core >= 3.9.0-1
+BuildRequires: eclipse-ecf-core >= 3.10.0-5
 BuildRequires: eclipse-emf-core >= 1:2.10.1-1
 BuildRequires: eclipse-license
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -259,7 +259,7 @@ Requires: batik-css >= 1.8-0.17
 Requires: xml-commons-apis >= 1.4.01-12
 Requires: atinject >= 1-18
 Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core >= 3.9.0-1
+Requires: eclipse-ecf-core >= 3.10.0-5
 Requires: eclipse-emf-core >= 1:2.10.1-1
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
@@ -548,21 +548,6 @@ sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.plat
 sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
 %endif
 
-%if %{bootstrap}
-# Temp workaround for unbreaking secondary arches
-cp -p /usr/share/java/httpcomponents/http{core,client}.jar .m2/p2/repo-sdk/plugins
-pushd .m2/p2/repo-sdk/plugins
-unzip httpclient.jar META-INF/MANIFEST.MF
-sed -i -e 's/4\.0/3.5/g' META-INF/MANIFEST.MF
-jar ufm httpclient.jar META-INF/MANIFEST.MF
-rm -r META-INF/
-unzip httpcore.jar META-INF/MANIFEST.MF
-sed -i -e 's/4\.0/3.2/g' META-INF/MANIFEST.MF
-jar ufm httpcore.jar META-INF/MANIFEST.MF
-rm -r META-INF/
-popd
-%endif
-
 # Use system osgi.annotation lib
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
@@ -1101,6 +1086,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-5
+- Non-bootstrap build
+- Rebuild for new ECF
+
 * Wed Aug 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-4.2
 - Fix erroneous requires on httpcomponents