From 49b83fd6e504db299f12d579e8add9dc9600b9ec Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Tue, 11 Dec 2018 13:26:24 +0000
Subject: [PATCH] Update to 2018-12 release

---
 MANIFEST.MF   | 15 +++++++--------
 ecj.spec      |  8 +++++---
 javaAPI.patch |  2 +-
 sources       |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/MANIFEST.MF b/MANIFEST.MF
index fec577b..4411ccb 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -1,10 +1,5 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
-Archiver-Version: Plexus Archiver
-Built-By: genie.releng
-Bundle-ManifestVersion: 2
-Bundle-Vendor: Eclipse.org
-Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
 Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
  .eclipse.jdt.internal.antadapter;x-internal:=true,org.eclipse.jdt.int
  ernal.compiler;x-internal:=true,org.eclipse.jdt.internal.compiler.apt
@@ -23,8 +18,12 @@ 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.13.0.v20170516-1929
+Bundle-Version: 3.16.0.v20181130-1748
 Bundle-ClassPath: .
-Created-By: Apache Maven
-Build-Jdk: 1.8.0_121
+Built-By: genie.releng
+Bundle-ManifestVersion: 2
+Bundle-Vendor: Eclipse.org
+Created-By: Apache Maven 3.5.4
+Build-Jdk: 1.8.0_192
+Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
 
diff --git a/ecj.spec b/ecj.spec
index 02f2bb2..3902bbd 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,10 +1,10 @@
 Epoch: 1
 
-%global qualifier S-4.9RC2-201809060745
+%global qualifier S-4.10RC2-201812060815
 
 Summary: Eclipse Compiler for Java
 Name: ecj
-Version: 4.9
+Version: 4.10
 Release: 1%{?dist}
 URL: http://www.eclipse.org
 License: EPL-2.0
@@ -38,7 +38,6 @@ the JDT Core batch compiler.
 %patch1
 
 sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
-sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml
 
 cp %{SOURCE3} pom.xml
 mkdir -p scripts/binary/META-INF/
@@ -80,6 +79,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Tue Dec 11 2018 Mat Booth <mat.booth@redhat.com> - 1:4.10-1
+- Update to 2018-12 release
+
 * Wed Sep 12 2018 Mat Booth <mat.booth@redhat.com> - 1:4.9-1
 - Update to latest release
 - Amend license tag
diff --git a/javaAPI.patch b/javaAPI.patch
index 9c11102..74da3a9 100644
--- a/javaAPI.patch
+++ b/javaAPI.patch
@@ -20,7 +20,7 @@
  					source="1.8"
  					target="1.8">
 -			<compilerarg line="-Xlint:none"/>
-+			<compilerarg line="-Xlint:none -encoding cp1252 -encoding cp1252"/>
++			<compilerarg line="-Xlint:none -encoding cp1252"/>
  		</javac>
  
  		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
diff --git a/sources b/sources
index 6ac0eba..4623b78 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ecjsrc-4.9RC2.jar) = 7171fdc50aa7e8e32becae2f2b9c285982c36defa9e6413d4d13e2654e73e4b06ac20075e1ac22937a2147dc8d57e2a8587a57d4349118b2f11dd51749cec799
-SHA512 (ecj-4.9.pom) = 7c573dacfe9dea8066e6f3d3a5407f46f1e874ba8d41127df8d7df94b15559b7ce50701a2fa0ec471897e6d3a1fe0b2b71c4f260b92dbab1b8330e58937cc21f
+SHA512 (ecjsrc-4.10RC2.jar) = e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
+SHA512 (ecj-4.10.pom) = 19347305c894aa1c874289bec291965ea4e129368763d7614a292de4cabd20e4ddb4c9cd628edc2b1b1761a1f1e2f7aa561cc54e36cf7ebbc5279bf3d3325a10
 SHA512 (java10api.jar) = b92faee6a4f7ab3d631e93ed99fffb101035bf7c0dd632dd5322c9e0d2848eeda496d6cf4d28122c88173fb7fcacc77ce40f2822e923903cec47114c9a25c242