From b84cccbe456ba855d8c7193296fdd0c15f74f6a3 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jul 21 2020 23:58:00 +0000
Subject: Require Java 11 explicitly

Drop hotspot exclusions from the JDK 6 era

---

diff --git a/eclipse.spec b/eclipse.spec
index 9298b3c..4ce1545 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -49,7 +49,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.16
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -231,8 +231,6 @@ everything in between.
 
 %package        swt
 Summary:        SWT Library for GTK+
-Requires:       java-headless >= 1:1.8.0
-Requires:       javapackages-tools
 Requires:       gtk3
 Requires:       webkitgtk4
 
@@ -241,8 +239,6 @@ SWT Library for GTK+.
 
 %package        equinox-osgi
 Summary:        Eclipse OSGi - Equinox
-Requires:       java-headless >= 1:1.8.0
-Requires:       javapackages-tools
 Provides:       osgi(system.bundle) = %{epoch}:%{version}
 
 %description  equinox-osgi
@@ -250,6 +246,8 @@ Eclipse OSGi - Equinox
 
 %package        platform
 Summary:        Eclipse platform common files
+Requires:       java-11-openjdk-headless
+Requires:       javapackages-tools
 Recommends:     eclipse-usage
 
 Requires: ant >= 1.10.5
@@ -274,8 +272,6 @@ Requires: lucene-core >= %{_lucene_version}
 Requires: lucene-analysis >= %{_lucene_version}
 Requires: lucene-queryparser >= %{_lucene_version}
 Requires: lucene-analyzers-smartcn >= %{_lucene_version}
-Requires: sat4j
-Requires: sac
 Requires: batik-css >= %{_batik_version}
 Requires: batik-util >= %{_batik_version}
 Requires: xmlgraphics-commons >= 2.3
@@ -294,7 +290,6 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release}
 Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
 Requires: httpcomponents-core
 Requires: httpcomponents-client
-Requires: osgi(org.tukaani.xz)
 
 # Obsoletes added in F31
 Obsoletes: eclipse-epp-logging <= 2.0.8-4
@@ -734,16 +729,11 @@ popd
 sed -i "s|-Xms40m|-Xms512m|g" eclipse.ini
 sed -i "s|-Xmx512m|-Xmx1024m|g" eclipse.ini
 sed -i '1i-protect\nroot' eclipse.ini
+sed -i '/-vmargs/i-vm\n%{_jvmdir}/java-11/bin/java' eclipse.ini
 
 # Temporary fix until https://bugs.eclipse.org/294877 is resolved
 cat >> eclipse.ini <<EOF
 -Dorg.eclipse.swt.browser.UseWebKitGTK=true
--XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
--XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
--XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
--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=%{_datadir}/eclipse/dropins
 -Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
 -Declipse.p2.skipMovedInstallDetection=true
@@ -1075,6 +1065,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-6
+- Require Java 11 explicitly
+- Drop hotspot exclusions from the JDK 6 era
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:4.16-5
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11