Compare commits

...

No commits in common. "c8" and "c9" have entirely different histories.
c8 ... c9

1 changed files with 11 additions and 23 deletions

View File

@ -8,7 +8,7 @@ Epoch: 1
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
Name: ecj Name: ecj
Version: %{eclipse_ver} Version: %{eclipse_ver}
Release: 10%{?dist} Release: 16%{?dist}
URL: https://www.eclipse.org URL: https://www.eclipse.org
License: EPL-2.0 License: EPL-2.0
@ -27,7 +27,7 @@ BuildRequires: ant
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: java-17-openjdk-devel BuildRequires: java-17-openjdk-devel
Requires: java-headless >= 1:1.8.0 Requires: (java-1.8.0-headless or java-11-headless or java-17-headless)
Requires: javapackages-tools Requires: javapackages-tools
%description %description
@ -50,7 +50,7 @@ rm ./META-INF/ECLIPSE_.{SF,RSA}
org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt
%build %build
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk export JAVA_HOME=/usr/lib/jvm/java-17
ant ant
%install %install
@ -70,28 +70,16 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
%{_mandir}/man1/ecj* %{_mandir}/man1/ecj*
%changelog %changelog
* Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-10 * Fri Oct 27 2023 Hui Wang <huwang@redhat.com> - 1:4.20-16
- Drop unnecessary javax16.api.jar (again) - Resolves: RHEL-14880 ecj requires specific java version
* Thu Feb 23 2023 Hui Wang <huwang@redhat.com> - 1:4.20-11
- Bump release so that the NVR on RHEL-9 is higher than RHEL-8
* Mon Feb 20 2023 Hui Wang <huwang@redhat.com> - 1:4.20-4
- Drop unnecessary javax16.api.jar
- Add dependency on javapackages-tools since the ecj binary requires it to run - Add dependency on javapackages-tools since the ecj binary requires it to run
* Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-9
- Trigger CI tests again
* Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-8
- Update BuildRequires to use java-17
* Tue Feb 14 2023 Hui Wang <huwang@redhat.com> - 1:4.20-7
- Fix JAVA_HOME
* Tue Feb 14 2023 Hui Wang <huwang@redhat.com> - 1:4.20-6
- Add requires java-11-openjdk and java-11-openjdk-headless
* Tue Feb 07 2023 Hui Wang <huwang@redhat.com> - 1:4.20-5
- Add javax16api.jar back
* Sat Feb 04 2023 Hui Wang <huwang@redhat.com> - 1:4.20-4
- Remove javax16api.jar which is not necessary in RHEL-8
* Thu Feb 02 2023 Hui Wang <huwang@redhat.com> - 1:4.20-3 * Thu Feb 02 2023 Hui Wang <huwang@redhat.com> - 1:4.20-3
- Add tmt gating plan - Add tmt gating plan