From 8656cf59730ab4667076974d72acc6e418699269 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sat, 29 Jun 2019 15:30:23 +0100
Subject: [PATCH] Update to latest upstream release

---
 MANIFEST.MF |  2 +-
 ecj.sh.in   |  4 ----
 ecj.spec    | 29 +++++++++++++----------------
 sources     |  4 ++--
 4 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 ecj.sh.in

diff --git a/MANIFEST.MF b/MANIFEST.MF
index 9f73431..7d260b6 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
  -internal:=true,org.eclipse.jdt.internal.compiler.tool;x-internal:=tr
  ue
 Bundle-Name: Eclipse Compiler for Java(TM)
-Bundle-Version: 3.17.0.v20190227-1706
+Bundle-Version: 3.18.0.v20190522-0428
 Bundle-ClassPath: .
 Built-By: genie.releng
 Bundle-ManifestVersion: 2
diff --git a/ecj.sh.in b/ecj.sh.in
deleted file mode 100644
index d8a40e9..0000000
--- a/ecj.sh.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=$(build-classpath ecj):${CLASSPATH=.} \
-java org.eclipse.jdt.internal.compiler.batch.Main "$@"
diff --git a/ecj.spec b/ecj.spec
index ed183ed..957b87e 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,17 +1,16 @@
 Epoch: 1
 
-%global qualifier S-4.11RC1-201903010040
+%global qualifier R-4.12-201906051800
 
 Summary: Eclipse Compiler for Java
 Name: ecj
-Version: 4.11
-Release: 0.1%{?dist}
+Version: 4.12
+Release: 1%{?dist}
 URL: http://www.eclipse.org
 License: EPL-2.0
 
-Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}RC1.jar
-Source1: ecj.sh.in
-Source3: https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/%{version}/ecj-%{version}.pom
+Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar
+Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.18.0/ecj-3.18.0.pom
 # Extracted from https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/%%{qualifier}/ecj-%%{version}.jar
 Source4: MANIFEST.MF
 # Java API stubs for newer JDKs
@@ -39,21 +38,16 @@ the JDT Core batch compiler.
 
 sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
 
-cp %{SOURCE3} pom.xml
+cp %{SOURCE1} pom.xml
 mkdir -p scripts/binary/META-INF/
 cp %{SOURCE4} scripts/binary/META-INF/MANIFEST.MF
 
 # JDTCompilerAdapter isn't used by the batch compiler
 rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
 
-# No dep on ant needed
-%pom_remove_dep org.apache.ant:ant
-
-# Symlinks and aliases
-%mvn_file :ecj ecj jdtcore
-%mvn_alias org.eclipse.jdt.core.compiler:ecj \
-  org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt \
-  org.eclipse.jdt:core org.eclipse.jdt:ecj
+# Aliases
+%mvn_alias org.eclipse.jdt:ecj org.eclipse.jdt:core org.eclipse.jdt.core.compiler:ecj \
+  org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt
 
 # Make Java API stubs available for other packages
 %mvn_artifact "org.eclipse:java10api:jar:10" %{SOURCE5}
@@ -67,7 +61,7 @@ ant -Djavaapi=%{SOURCE5}
 %mvn_install
 
 # Install the ecj wrapper script
-install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj
+%jpackage_script org.eclipse.jdt.internal.compiler.batch.Main '' '' ecj ecj true
 
 # Install manpage
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@@ -79,6 +73,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Sat Jun 29 2019 Mat Booth <mat.booth@redhat.com> - 1:4.12-1
+- Update to latest upstream release
+
 * Thu Mar 07 2019 Mat Booth <mat.booth@redhat.com> - 1:4.11-0.1
 - Update to latest release candidate of 4.11
 
diff --git a/sources b/sources
index 75a717e..5619d50 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ecjsrc-4.11RC1.jar) = d996f69fb860e6fc15ba87bc8b4e129820ce0535427f42e494cfeeafcb265e2faaeae507a3294ce016a28ecf8b0f5927a8bae8b7c77ea103787db59009a95458
-SHA512 (ecj-4.11.pom) = e2245b15cc0253246f7199f6dcc9e6624e149be1c782b32df6a2f94215fcc7408fb6adca56ce29985fd424cb012a875aedfaa43c1228e457b642572461435317
+SHA512 (ecjsrc-4.12.jar) = 0e5d3ef13d168784965e5215d89462987bd455d28c26f5e494ba6a4d743b9c9c03716ccbd10d8620f7f4eb71c8a28f05b48a1778e24edf59b6a241a0565b4751
+SHA512 (ecj-3.18.0.pom) = 0e17dcd37af1bef9fa1318907012a0bb6e02f573013205dbb3c9f5d93a7d7262a5ae6c24c86570d46ae5317ba57511b68f8d2182feccecc471c68f96bb1485ec
 SHA512 (java10api.jar) = b92faee6a4f7ab3d631e93ed99fffb101035bf7c0dd632dd5322c9e0d2848eeda496d6cf4d28122c88173fb7fcacc77ce40f2822e923903cec47114c9a25c242