From ba06f84a35ea5e38db7754b308b1a251a21a0e25 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Nov 12 2020 10:16:24 +0000
Subject: Obsolete usage plugin and ensure encoding in use is UTF-8 during the build


---

diff --git a/eclipse.spec b/eclipse.spec
index bb2e18b..cb158f2 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -57,7 +57,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL-2.0
 URL:            https://www.eclipse.org/
 
@@ -159,7 +159,7 @@ BuildRequires: pkgconfig(libsecret-1)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(webkit2gtk-4.0)
 BuildRequires: icu4j >= 1:65.1
-BuildRequires: ant >= 1.10.5
+BuildRequires: ant >= 1.10.9
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
 BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5
 BuildRequires: jsch
@@ -245,9 +245,9 @@ Eclipse OSGi - Equinox
 Summary:        Eclipse platform common files
 Requires:       java-11-openjdk-devel
 Requires:       javapackages-tools
-Recommends:     eclipse-usage
+Obsoletes:      eclipse-usage < 4.17.0-1
 
-Requires: ant >= 1.10.5
+Requires: ant >= 1.10.9
 Requires: ant-antlr ant-apache-bcel ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf
 Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5
 Requires: apache-commons-logging
@@ -662,8 +662,7 @@ export M_CFLAGS="$CFLAGS"
 export M_ARCH="$LDFLAGS"
 
 #This is the lowest value where the build succeeds. 512m is not enough.
-export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-export JAVA_HOME=%{_jvmdir}/java-11
+export MAVEN_OPTS="-Dfile.encoding=UTF-8 -Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
 
 # TODO: Fix bug in the tycho installation
 xmvn -o install:install-file -Dtycho.mode=maven -Dfile=%{_javadir}/tycho/tycho-lib-detector.jar -DpomFile=%{_mavenpomdir}/tycho/tycho-lib-detector.pom
@@ -734,7 +733,6 @@ EOF
 popd #eclipse
 
 %install
-export JAVA_HOME=%{_jvmdir}/java-11
 %mvn_install
 
 # Some directories we need
@@ -1062,6 +1060,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Wed Nov 11 2020 Mat Booth <mat.booth@redhat.com> - 1:4.17-3
+- Obsolete usage plugin and ensure encoding in use is UTF-8 during the build
+
 * Fri Nov  6 2020 Mat Booth <mat.booth@redhat.com> - 1:4.17-2
 - Fix build on non-intel arches