From 207c510d5390965ab9c99d268f83ef842d5d6fa9 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 3 Apr 2017 19:12:44 +0100
Subject: [PATCH] Build missing remote ant support jar

---
 eclipse.spec        |  5 ++++-
 fix_ant_build.patch | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/eclipse.spec b/eclipse.spec
index 066d9f4..17770a1 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -47,7 +47,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -1107,6 +1107,9 @@ fi
 %{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Mon Apr 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-3
+- Build missing remote ant support jar
+
 * Fri Mar 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-2
 - Re-enable test-framework for platform tests
 - Drop long-time broken efj script
diff --git a/fix_ant_build.patch b/fix_ant_build.patch
index 382c366..da2811a 100644
--- a/fix_ant_build.patch
+++ b/fix_ant_build.patch
@@ -27,6 +27,27 @@
 +output.lib/remote.jar = remote_bin/
 +src.includes = about.html
  javacWarnings..=-unavoidableGenericProblems
+--- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig	2017-04-03 18:40:41.033489412 +0100
++++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties	2017-04-03 18:43:21.614928391 +0100
+@@ -14,8 +14,8 @@
+ source.lib/antrunner.jar = Ant Runner Support/
+ output.lib/antrunner.jar = ant_runner_support_bin/
+ # Compiled with 1.6 locally, see bug 495617:
+-#source.lib/remoteAnt.jar = Remote Ant Support/
+-#output.lib/remoteAnt.jar = remote_support_bin/
++source.lib/remoteAnt.jar = Remote Ant Support/
++output.lib/remoteAnt.jar = remote_support_bin/
+ src.includes = about.html,\
+                about_files/,\
+                Remote Ant Support/
+@@ -31,6 +31,5 @@
+                lib/antrunner.jar,\
+                lib/remoteAnt.jar,\
+                css/
+-jars.compile.order=.,lib/antrunner.jar
+-# ,lib/remoteAnt.jar
++jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar
+ javacWarnings..=-unavoidableGenericProblems
 --- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig	2017-01-09 13:30:24.238066571 +0000
 +++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml	2017-01-09 13:31:19.228456113 +0000
 @@ -1,106 +1,8 @@