From 31217fea5cdae98abb2e1a7824be2c9f86f0f71e Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 27 2019 16:57:45 +0000
Subject: Fix NoClassDefFoundError regression in ant support


---

diff --git a/eclipse.spec b/eclipse.spec
index 00a40f7..2f6fc78 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -42,7 +42,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -126,6 +126,9 @@ Patch27: eclipse-ebz548211-2.patch
 # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=542708
 Patch28: eclipse-ebz542708.patch
 
+# Fix regression in ant support
+Patch29: fix-ant-execution.patch
+
 # Upstream no longer supports non-64bit arches
 ExcludeArch: s390 %{arm} %{ix86}
 
@@ -414,6 +417,7 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 
 # Optional (unused) multipart support (see patch 25)
 rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java
@@ -1106,6 +1110,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Jun 27 2019 Mat Booth <mat.booth@redhat.com> - 1:4.12-5
+- Fix NoClassDefFoundError regression in ant support
+
 * Thu Jun 20 2019 Mat Booth <mat.booth@redhat.com> - 1:4.12-4
 - Fix deps on batik stack
 
diff --git a/fix-ant-execution.patch b/fix-ant-execution.patch
new file mode 100644
index 0000000..5ba0ebb
--- /dev/null
+++ b/fix-ant-execution.patch
@@ -0,0 +1,26 @@
+diff --git a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java
+index b6c0d1e68..a35e683d7 100644
+--- a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java
++++ b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java
+@@ -19,12 +19,6 @@ import java.net.SocketPermission;
+ import java.security.Permission;
+ import java.util.PropertyPermission;
+ 
+-import org.eclipse.ant.core.AntCorePlugin;
+-import org.eclipse.ant.core.AntSecurityException;
+-import org.eclipse.core.runtime.IStatus;
+-import org.eclipse.core.runtime.Platform;
+-import org.eclipse.core.runtime.Status;
+-
+ /**
+  * A security manager that always throws an <code>AntSecurityException</code> if the calling thread attempts to cause the Java Virtual Machine to
+  * exit/halt or if the restricted thread attempts to set a System property. Otherwise this manager just delegates to the pre-existing manager passed
+@@ -453,8 +447,6 @@ public class AntSecurityManager extends SecurityManager {
+ 			return super.getInCheck();
+ 		}
+ 		catch (NoSuchMethodException | SecurityException e) {
+-			Platform.getLog(AntCorePlugin.getPlugin().getBundle()).log(new Status(IStatus.WARNING, "org.eclipse.ant.launching", //$NON-NLS-1$
+-					RemoteAntMessages.getString("AntSecurityManager.getInCheck"))); //$NON-NLS-1$
+ 			return false;
+ 		}
+ 	}