rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

Fix build with java 9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=87
This commit is contained in:
Fridrich Strba
2017-09-06 17:53:01 +00:00
committed by Git OBS Bridge
parent cc2f5a0813
commit dbbfb528cd
7 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ant-junit.spec
View File

@@ -43,6 +43,7 @@ Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
@@ -50,7 +51,7 @@ BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
%else
BuildRequires: java-devel >= 1.5.0
BuildRequires: java-devel >= 1.6.0
%endif
BuildRequires: antlr-bootstrap
BuildRequires: javapackages-tools
@@ -75,7 +76,7 @@ BuildRequires: xml-commons-apis
BuildRequires: strip-nondeterminism
%endif
%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: java-devel >= 1.6.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
Requires: xml-commons-apis
@@ -350,6 +351,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%endif
%patch1
%patch3 -p1
%if ! %{with bootstrap}
%patch4 -p1
%endif
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm