From 3026785eddef57c313b11c2819e9b69452732c4d Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 25 2020 19:53:45 +0000
Subject: Rebuild against new jakarta-el,-jsp packages

Fix javadoc generation relying on Windows version of SWT

---

diff --git a/eclipse.spec b/eclipse.spec
index dd78c99..b737660 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -8,7 +8,7 @@
 
 Epoch:                  1
 
-%global eb_commit       2f6d1ff5950edd8c0b55bbcc93491bce269e4272
+%global eb_commit       d2d5e1813a3213c8c4ff3f6a5049fecd003111df
 %global eclipse_rel     %{version}
 %global eclipse_tag     R-%{eclipse_rel}-202006040540
 
@@ -55,14 +55,14 @@ Name:           eclipse
 Version:        4.16
 Release:        12%{?dist}
 License:        EPL-2.0
-URL:            http://www.eclipse.org/
+URL:            https://www.eclipse.org/
 
 Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{eclipse_tag}/eclipse-platform-sources-%{eclipse_rel}.tar.xz
 
 # Can generate locally with:
 # git archive --format=tar --prefix=org.eclipse.linuxtools.eclipse-build-%%{eb_commit}/ \
 #   %%{eb_commit} | xz > org.eclipse.linuxtools.eclipse-build-%%{eb_commit}.tar.xz
-Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
+Source1: https://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
 
 # Toolchain configurations for all EEs needed by Eclipse bundles
 Source2: toolchains.xml
@@ -585,7 +585,7 @@ sed -i -e '/<features>/a<feature id="org.eclipse.core.runtime.feature"/>' \
   eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
 
 # Ensure batch compiler gets installed correctly
-sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.batch" download-size="0" install-size="0" version="0.0.0" unpack="false"/>' \
+%pom_xpath_inject 'feature' '<plugin id="org.eclipse.jdt.core.compiler.batch" download-size="0" install-size="0" version="0.0.0" unpack="false"/>' \
   eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
 sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
   eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
diff --git a/sources b/sources
index c3c126e..41c1b21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (org.eclipse.linuxtools.eclipse-build-2f6d1ff5950edd8c0b55bbcc93491bce269e4272.tar.xz) = 39821ad15f0e6058ee0af4bfd791ed3e3bf415aad2c40458ce14848c91d6d795257084e033d33d25b4cee32df8c94ef705c5df9f102a4bb81e913723b5ea9fe5
+SHA512 (org.eclipse.linuxtools.eclipse-build-d2d5e1813a3213c8c4ff3f6a5049fecd003111df.tar.xz) = 0a8cb78b543b635aa0b3f69028e145eadaa71995b8a51adc8a4b737b5311090044a393283bf4ee1b40baf25c346e460d67d281e6d6151206aba4b3a808ac6e01
 SHA512 (eclipse-platform-sources-4.16.tar.xz) = e97d56f4ff7accca82993ebb8edf6cd012f20273f063c764134753dafb38972497521f2a3150c2650655c17149e135eccf781b536d50b382cd1e2fb41ec4a692