Fridrich Strba 2022-03-30 10:17:13 +00:00 committed by Git OBS Bridge
parent 3c5044863b
commit 8b85a47c30
4 changed files with 12 additions and 12 deletions

View File

@ -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> Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -31,9 +31,7 @@ Source1: jflex-%{version}-generated-files.tar.xz
Source2: jflex-build.xml Source2: jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant BuildRequires: ant
%if 0%{?suse_version} > 1500
BuildRequires: glassfish-annotation-api BuildRequires: glassfish-annotation-api
%endif
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
Requires: java_cup Requires: java_cup
@ -99,10 +97,7 @@ rm -rf src/generated
cp %{SOURCE2} build.xml cp %{SOURCE2} build.xml
mkdir -p lib mkdir -p lib
%patch0 -p1 %patch0 -p1
build-jar-repository -s lib java-cup-runtime build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%if 0%{?suse_version} > 1500
build-jar-repository -s lib glassfish-annotation-api
%endif
%else %else
%{mvn_file} : %{name} JFlex %{mvn_file} : %{name} JFlex
%endif %endif

View File

@ -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> Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -30,9 +30,7 @@ Source1: jflex-%{version}-generated-files.tar.xz
Source2: jflex-build.xml Source2: jflex-build.xml
Patch0: jflex-1.8.2-no-auto-value.patch Patch0: jflex-1.8.2-no-auto-value.patch
BuildRequires: ant BuildRequires: ant
%if 0%{?suse_version} > 1500
BuildRequires: glassfish-annotation-api BuildRequires: glassfish-annotation-api
%endif
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
Requires: java_cup Requires: java_cup
@ -98,10 +96,7 @@ rm -rf src/generated
cp %{SOURCE2} build.xml cp %{SOURCE2} build.xml
mkdir -p lib mkdir -p lib
%patch0 -p1 %patch0 -p1
build-jar-repository -s lib java-cup-runtime build-jar-repository -s lib java-cup-runtime glassfish-annotation-api
%if 0%{?suse_version} > 1500
build-jar-repository -s lib glassfish-annotation-api
%endif
%else %else
%{mvn_file} : %{name} JFlex %{mvn_file} : %{name} JFlex
%endif %endif