From addc7dcfc0ec1c639d6b4fdcc7adf4142ee92370 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: May 01 2019 16:01:41 +0000
Subject: Bump requirements on Jetty

Avoid reliance on Javascript in SWT build

---

diff --git a/eclipse.spec b/eclipse.spec
index 6735e2b..eafacb1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -12,7 +12,7 @@ Epoch:                  1
 %global eclipse_rel     %{version}RC2
 %global eclipse_tag     S-%{eclipse_rel}-201903070500
 
-%global _jetty_version  9.4.17
+%global _jetty_version  9.4.18
 %global _lucene_version 7.7.0
 
 %ifarch %{ix86}
@@ -41,7 +41,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -87,30 +87,33 @@ Patch12: eclipse-fix-dropins.patch
 # org.w3c.dom.smil -> removed
 Patch13: eclipse-feature-plugins-to-category-ius.patch
 
-Patch15: eclipse-support-symlink-bundles.patch
+Patch14: eclipse-support-symlink-bundles.patch
 
 # Fix various JDT and PDE tests
-Patch20: eclipse-fix-tests.patch
+Patch15: eclipse-fix-tests.patch
 
 # Droplet fixes
-Patch21: eclipse-adjust-droplets.patch
-Patch22: eclipse-pde-tp-support-droplets.patch
+Patch16: eclipse-adjust-droplets.patch
+Patch17: eclipse-pde-tp-support-droplets.patch
 
 # Disable uses by default
-Patch24: eclipse-disable-uses-constraints.patch
+Patch18: eclipse-disable-uses-constraints.patch
 
 # Droplet fixes
-Patch26: eclipse-make-droplets-runnable.patch
-Patch27: eclipse-disable-droplets-in-dropins.patch
+Patch19: eclipse-make-droplets-runnable.patch
+Patch20: eclipse-disable-droplets-in-dropins.patch
 
 # Temporary measure until wayland improves
-Patch28: prefer_x11_backend.patch
+Patch21: prefer_x11_backend.patch
 
 # Fix errors when building ant launcher
-Patch29: fix_ant_build.patch
+Patch22: fix_ant_build.patch
 
 # Hide the p2 Droplets from cluttering Install Wizard Combo
-Patch30: eclipse-hide-droplets-from-install-wizard.patch
+Patch23: eclipse-hide-droplets-from-install-wizard.patch
+
+# Avoid the need for a javascript interpreter at build time
+Patch24: eclipse-swt-avoid-javascript-at-build.patch
 
 # Upstream no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
@@ -126,7 +129,6 @@ BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-shade-plugin
 BuildRequires: xml-maven-plugin
-BuildRequires: rhino
 BuildRequires: sonatype-oss-parent
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -384,19 +386,20 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 #%patch6
 %patch12
 %patch13 -p1
+%patch14
 %patch15
+%patch16
+%patch17
+%patch18
+%patch19
 %patch20
-%patch21
-%patch22
-%patch24
-%patch26
-%patch27
 %if ! %{use_wayland}
 # Enable wayland by default on F27+
-%patch28
+%patch21
 %endif
-%patch29
-%patch30 -p1
+%patch22
+%patch23 -p1
+%patch24
 
 # Remove python-based test
 rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py
@@ -1093,6 +1096,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Wed May 01 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-7
+- Bump requirements on Jetty
+- Avoid reliance on Javascript in SWT build
+
 * Tue Apr 30 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-6
 - Disable hard requirement on ant-junit5