diff --git a/ecj.spec b/ecj.spec index 9b02c2e..8ea04f3 100644 --- a/ecj.spec +++ b/ecj.spec @@ -5,7 +5,7 @@ Epoch: 1 Summary: Eclipse Compiler for Java Name: ecj Version: 4.18 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.eclipse.org License: EPL-2.0 @@ -29,7 +29,7 @@ BuildRequires: ant BuildRequires: javapackages-local # Build with Java 11 against bootclasspath of Java 8 -BuildRequires: java-15-openjdk-devel +BuildRequires: java-11-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel %description @@ -54,10 +54,9 @@ rm ./META-INF/ECLIPSE_.{SF,RSA} # Make Java API stubs available for other packages %mvn_artifact "org.eclipse:javax15api:jar:15" %{SOURCE5} -%mvn_alias "org.eclipse:javax15api:jar:15" "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9" %build -JAVA_HOME=%{_jvmdir}/java-15 ant -Djavaapi=%{SOURCE5} +ant -Djavaapi=%{SOURCE5} %install %mvn_artifact pom.xml ecj.jar @@ -76,6 +75,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1 %{_mandir}/man1/ecj* %changelog +* Mon Mar 01 2021 Mat Booth - 1:4.18-3 +- Allow building against Java 11 + * Tue Jan 26 2021 Fedora Release Engineering - 1:4.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 50d4b02..783c8e8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ecj-3.24.0.pom) = 8ed2e8b16b917a4274a9e06c411f4a03d12c229b93038d400156ff5507a7983c1b8eaea7152a03416392adc4ce845567bc1200063ec3912384fd6c32261ff601 SHA512 (ecjsrc-4.18.jar) = d68134a517b4dfb24023c0b4871cf25513454049b631729c9b57767c7045a10299eba2bda2188d18492899165a7a723e94595cbc47a849ee12eaa66596df4f4b -SHA512 (javax15api.jar) = b7a85eae8eeb44564eddeab88b7873b5e5701622c888e316fb95a988d7138db66ed8438605a30df2ac4c442873b4a99325b85d9102f6fc47686a361f25fd66e6 +SHA512 (javax15api.jar) = c1b16bff598301fa94cb50068350e006a249b5c71185c02113049af7c7b2afb298ef8651263221ed64a3282a0b515ab99cdd0fc44f94f606e9d859616ec2ef6b