From ff5d1f087e0ca97f37d76d5ec620ac2b5bb773fe14cab6ee51df9d7e4c5b0149 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 16 Mar 2022 18:08:03 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=27 --- jflex-bootstrap.spec | 6 ++++-- jflex.spec | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec index 7e8f979..f9ecc6a 100644 --- a/jflex-bootstrap.spec +++ b/jflex-bootstrap.spec @@ -31,6 +31,7 @@ Source1: jflex-%{version}-generated-files.tar.xz Source2: jflex-build.xml Patch0: jflex-1.8.2-no-auto-value.patch BuildRequires: ant +BuildRequires: glassfish-annotation-api BuildRequires: java-devel BuildRequires: javapackages-local Requires: java_cup @@ -94,8 +95,9 @@ rm -rf src/generated %if %{with bootstrap} %setup -q -T -D -a 1 -n jflex-%{version} cp %{SOURCE2} build.xml -%patch0 -p1 +build-jar-repository -s lib glassfish-annotation-api mkdir -p lib +%patch0 -p1 build-jar-repository -s lib java-cup-runtime %else %{mvn_file} : %{name} JFlex @@ -124,7 +126,7 @@ cp -a target/jflex-%{version}.jar %{buildroot}%{_javadir}/jflex.jar %fdupes -s %{buildroot}/%{_javadocdir}/%{name} %endif -%jpackage_script jflex.Main "" "" jflex:java-cup jflex true +%jpackage_script jflex.Main "" "" jflex:java-cup:java-cup-runtime jflex true %if %{with bootstrap} %files diff --git a/jflex.spec b/jflex.spec index 44d63b1..295c209 100644 --- a/jflex.spec +++ b/jflex.spec @@ -30,6 +30,7 @@ Source1: jflex-%{version}-generated-files.tar.xz Source2: jflex-build.xml Patch0: jflex-1.8.2-no-auto-value.patch BuildRequires: ant +BuildRequires: glassfish-annotation-api BuildRequires: java-devel BuildRequires: javapackages-local Requires: java_cup @@ -93,8 +94,9 @@ rm -rf src/generated %if %{with bootstrap} %setup -q -T -D -a 1 -n jflex-%{version} cp %{SOURCE2} build.xml -%patch0 -p1 +build-jar-repository -s lib glassfish-annotation-api mkdir -p lib +%patch0 -p1 build-jar-repository -s lib java-cup-runtime %else %{mvn_file} : %{name} JFlex @@ -123,7 +125,7 @@ cp -a target/jflex-%{version}.jar %{buildroot}%{_javadir}/jflex.jar %fdupes -s %{buildroot}/%{_javadocdir}/%{name} %endif -%jpackage_script jflex.Main "" "" jflex:java-cup jflex true +%jpackage_script jflex.Main "" "" jflex:java-cup:java-cup-runtime jflex true %if %{with bootstrap} %files From 56fcaa032f5b6aa6326f60c3f371ea735f5ae9aa871a2ce640e88edaa9c59efc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 10:43:27 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=28 --- jflex-bootstrap.spec | 6 +++++- jflex.spec | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec index f9ecc6a..89fd94f 100644 --- a/jflex-bootstrap.spec +++ b/jflex-bootstrap.spec @@ -31,7 +31,9 @@ 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 @@ -95,10 +97,12 @@ rm -rf src/generated %if %{with bootstrap} %setup -q -T -D -a 1 -n jflex-%{version} cp %{SOURCE2} build.xml -build-jar-repository -s lib glassfish-annotation-api 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 %else %{mvn_file} : %{name} JFlex %endif diff --git a/jflex.spec b/jflex.spec index 295c209..1473d2a 100644 --- a/jflex.spec +++ b/jflex.spec @@ -30,7 +30,9 @@ 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 @@ -94,10 +96,12 @@ rm -rf src/generated %if %{with bootstrap} %setup -q -T -D -a 1 -n jflex-%{version} cp %{SOURCE2} build.xml -build-jar-repository -s lib glassfish-annotation-api 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 %else %{mvn_file} : %{name} JFlex %endif From 87b45f3b4a09deb03150ec7028dbdafad8fec81a6c00b7e9f12328bacae1880c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 14:46:10 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=29 --- jflex-bootstrap.spec | 2 +- jflex.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec index 89fd94f..9dcaf39 100644 --- a/jflex-bootstrap.spec +++ b/jflex-bootstrap.spec @@ -130,7 +130,7 @@ cp -a target/jflex-%{version}.jar %{buildroot}%{_javadir}/jflex.jar %fdupes -s %{buildroot}/%{_javadocdir}/%{name} %endif -%jpackage_script jflex.Main "" "" jflex:java-cup:java-cup-runtime jflex true +%jpackage_script jflex.Main "" "" jflex:java-cup jflex true %if %{with bootstrap} %files diff --git a/jflex.spec b/jflex.spec index 1473d2a..ce0046e 100644 --- a/jflex.spec +++ b/jflex.spec @@ -129,7 +129,7 @@ cp -a target/jflex-%{version}.jar %{buildroot}%{_javadir}/jflex.jar %fdupes -s %{buildroot}/%{_javadocdir}/%{name} %endif -%jpackage_script jflex.Main "" "" jflex:java-cup:java-cup-runtime jflex true +%jpackage_script jflex.Main "" "" jflex:java-cup jflex true %if %{with bootstrap} %files From 3c5044863b4f6dec6da015a5e6252e6e9ceb853da5e70d57da0d2ef5c7c10862 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 15:44:50 +0000 Subject: [PATCH 4/4] build against standalone annotation-api OBS-URL: https://build.opensuse.org/package/show/Java:packages/jflex?expand=0&rev=30 --- jflex-bootstrap.changes | 7 +++++++ jflex.changes | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes index d6d3412..e892b06 100644 --- a/jflex-bootstrap.changes +++ b/jflex-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba + +- Build against standalone glassfish-annotation-api for relevant + distribution versions that have JDK that does not contain the + JavaEE modules + ------------------------------------------------------------------- Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba diff --git a/jflex.changes b/jflex.changes index d6d3412..e892b06 100644 --- a/jflex.changes +++ b/jflex.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba + +- Build against standalone glassfish-annotation-api for relevant + distribution versions that have JDK that does not contain the + JavaEE modules + ------------------------------------------------------------------- Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba