From da40509feddf564161d85341b325fcda77da499a Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 19 2020 20:02:56 +0000
Subject: Non-bootstrap build


---

diff --git a/eclipse.spec b/eclipse.spec
index 4c9dce2..fe6aa8b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,7 +1,7 @@
 # Set 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.
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 # Set this to avoid building contributor tools
 %bcond_without contrib_tools
@@ -49,7 +49,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -448,14 +448,9 @@ sed -i -e '/jgit.dirtyWorkingTree>/a<strictSrcIncludes>false</strictSrcIncludes>
 # Don't need annotations for obsolete JDKs
 %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core
 %pom_xpath_remove "plugin[@version='1.1.500.qualifier']" eclipse.jdt/org.eclipse.jdt-feature/feature.xml
-sed -i -e '/org\.eclipse\.jdt\.annotation;bundle-version="\[1\.1\.0,2\.0\.0)"/d' \
-  eclipse.jdt.core/org.eclipse.jdt.core.tests.{model,builder,compiler}/META-INF/MANIFEST.MF \
-  eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF \
-  eclipse.jdt.ui/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF
 
 # javax.annotation -> jakarta.annotation-api
 sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' eclipse-platform-parent/pom.xml \
-  eclipse.jdt.core/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF \
   eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
   eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml \
   eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml \
@@ -595,9 +590,6 @@ sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.bat
 sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
   eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
 
-# Include maven descriptors to allow our test execution setup to work
-%pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent
-
 # Don't set perms on files for platforms that aren't linux
 for f in rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
   grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
@@ -1081,6 +1073,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-2
+- Non-bootstrap build
+
 * Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-1
 - Update to latest upstream release