pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 521766 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/521766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:18:55 +00:00 committed by Git OBS Bridge
commit f5ac8731ed
7 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ant-antlr.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-sourcetarget.patch
+ Change java source and target versions to 1.6 to allow build
with jdk9
- For non-boostrap builds require java-devel >= 1.6
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com

6
ant-antlr.spec
View File

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

9
ant-junit.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-sourcetarget.patch
+ Change java source and target versions to 1.6 to allow build
with jdk9
- For non-boostrap builds require java-devel >= 1.6
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com

6
ant-junit.spec
View File

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

9
ant.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 6 17:49:21 UTC 2017 - fstrba@suse.com
- Added patch:
* apache-ant-1.9.9-sourcetarget.patch
+ Change java source and target versions to 1.6 to allow build
with jdk9
- For non-boostrap builds require java-devel >= 1.6
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com Fri Jun 9 09:05:31 UTC 2017 - tchvatal@suse.com

6
ant.spec
View File

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

13
apache-ant-1.9.9-sourcetarget.patch Normal file
View File

@ -0,0 +1,13 @@
--- apache-ant-1.9.9/build.xml 2017-02-02 18:55:08.000000000 +0100
+++ apache-ant-1.9.9/build.xml 2017-09-06 19:42:13.917021125 +0200
@@ -104,8 +104,8 @@
<property name="chmod.maxparallel" value="250"/>
<property name="deprecation" value="false"/>
<property name="optimize" value="true"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="1.6"/>
+ <property name="javac.source" value="1.6"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>
<property name="test.haltonfailure" value="false"/>