From 8b85a47c3031da13f1c58b7f2753db637af2927f6bce13ed9aa15b72eae03b92 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 30 Mar 2022 10:17:13 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=32

---
 jflex-bootstrap.changes | 5 +++++
 jflex-bootstrap.spec    | 7 +------
 jflex.changes           | 5 +++++
 jflex.spec              | 7 +------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes
index e892b06..5c8c0d4 100644
--- a/jflex-bootstrap.changes
+++ b/jflex-bootstrap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 10:16:51 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the standalone JavaEE modules inconditionally
+
 -------------------------------------------------------------------
 Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec
index 9dcaf39..3aaf4e7 100644
--- a/jflex-bootstrap.spec
+++ b/jflex-bootstrap.spec
@@ -31,9 +31,7 @@ Source1:        jflex-%{version}-generated-files.tar.xz
 Source2:        jflex-build.xml
 Patch0:         jflex-1.8.2-no-auto-value.patch
 BuildRequires:  ant
-%if 0%{?suse_version} > 1500
 BuildRequires:  glassfish-annotation-api
-%endif
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 Requires:       java_cup
@@ -99,10 +97,7 @@ rm -rf src/generated
 cp %{SOURCE2} build.xml
 mkdir -p lib
 %patch0 -p1
-build-jar-repository -s lib java-cup-runtime
-%if 0%{?suse_version} > 1500
-build-jar-repository -s lib glassfish-annotation-api
-%endif
+build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
 %else
 %{mvn_file} : %{name} JFlex
 %endif
diff --git a/jflex.changes b/jflex.changes
index e892b06..5c8c0d4 100644
--- a/jflex.changes
+++ b/jflex.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 10:16:51 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the standalone JavaEE modules inconditionally
+
 -------------------------------------------------------------------
 Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jflex.spec b/jflex.spec
index ce0046e..4a973c2 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -30,9 +30,7 @@ Source1:        jflex-%{version}-generated-files.tar.xz
 Source2:        jflex-build.xml
 Patch0:         jflex-1.8.2-no-auto-value.patch
 BuildRequires:  ant
-%if 0%{?suse_version} > 1500
 BuildRequires:  glassfish-annotation-api
-%endif
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 Requires:       java_cup
@@ -98,10 +96,7 @@ rm -rf src/generated
 cp %{SOURCE2} build.xml
 mkdir -p lib
 %patch0 -p1
-build-jar-repository -s lib java-cup-runtime
-%if 0%{?suse_version} > 1500
-build-jar-repository -s lib glassfish-annotation-api
-%endif
+build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
 %else
 %{mvn_file} : %{name} JFlex
 %endif