forked from pool/jflex
Accepting request 962502 from Java:packages
build against standalone annotation-api OBS-URL: https://build.opensuse.org/request/show/962502 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jflex?expand=0&rev=21
This commit is contained in:
commit
85b043c0bc
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- 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 <fstrba@suse.com>
|
Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -31,6 +31,9 @@ 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
|
||||||
|
%endif
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
Requires: java_cup
|
Requires: java_cup
|
||||||
@ -94,9 +97,12 @@ rm -rf src/generated
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%setup -q -T -D -a 1 -n jflex-%{version}
|
%setup -q -T -D -a 1 -n jflex-%{version}
|
||||||
cp %{SOURCE2} build.xml
|
cp %{SOURCE2} build.xml
|
||||||
%patch0 -p1
|
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
|
%patch0 -p1
|
||||||
build-jar-repository -s lib java-cup-runtime
|
build-jar-repository -s lib java-cup-runtime
|
||||||
|
%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
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- 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 <fstrba@suse.com>
|
Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -30,6 +30,9 @@ 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
|
||||||
|
%endif
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
Requires: java_cup
|
Requires: java_cup
|
||||||
@ -93,9 +96,12 @@ rm -rf src/generated
|
|||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
%setup -q -T -D -a 1 -n jflex-%{version}
|
%setup -q -T -D -a 1 -n jflex-%{version}
|
||||||
cp %{SOURCE2} build.xml
|
cp %{SOURCE2} build.xml
|
||||||
%patch0 -p1
|
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
|
%patch0 -p1
|
||||||
build-jar-repository -s lib java-cup-runtime
|
build-jar-repository -s lib java-cup-runtime
|
||||||
|
%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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user