From 07981cf3f62e0f3423cffe270df3358d45dafabb Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Tue, 31 Oct 2023 11:43:31 +0800
Subject: [PATCH] Resolves: RHEL-14879 ecj requires specific java version

---
 .fmf/version    | 1 +
 ecj.spec        | 7 +++++--
 plans/smoke.fmf | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/smoke.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ecj.spec b/ecj.spec
index 50484b8..7f5d56b 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name:    ecj
 Version: %{eclipse_ver}
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL:     https://www.eclipse.org
 License: EPL-2.0
 
@@ -27,7 +27,7 @@ BuildRequires: ant
 BuildRequires: javapackages-local
 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
 
 %description
@@ -70,6 +70,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Fri Oct 27 2023 Hui Wang <huwang@redhat.com> - 1:4.20-11
+- Resolves: RHEL-14879 ecj requires specific java version
+
 * Wed Feb 15 2023 Coty Sutherland <csutherl@redhat.com> - 1:4.20-10
 - Drop unnecessary javax16.api.jar (again)
 - Add dependency on javapackages-tools since the ecj binary requires it to run
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
new file mode 100644
index 0000000..55d7ec1
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,9 @@
+summary: Basic smoke test
+prepare:
+  - name: packages
+    how: install
+    package:
+      - ecj
+execute:
+    how: tmt
+    script: ecj -version