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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=96

Browse Source
This commit is contained in:
Fridrich Strba 2017-09-29 15:37:21 +00:00 committed by Git OBS Bridge
parent e5b8d888a9
commit 50bd78e899
7 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ant-antlr.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant-antlr.spec
View File

@ -45,6 +45,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -355,6 +356,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

8
ant-junit.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant-junit.spec
View File

@ -45,6 +45,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -355,6 +356,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

8
ant.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
- Detect our java-1_5_0-gcj_compat as java 6 to allow building
with source and target level 1.6
Code that needs classes from java 6 that are not part of the
gij/gcj will need just to require java-devel >= 1.6
-------------------------------------------------------------------
Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com

2
ant.spec
View File

@ -44,6 +44,7 @@ Patch1: apache-ant-class-path-in-manifest.patch
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
Patch6: apache-ant-1.9.9-detect_gij_as_java6.patch
%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#BuildRequires: java-devel >= 1.5
@ -354,6 +355,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
# clean jar files
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm

11
apache-ant-1.9.9-detect_gij_as_java6.patch Normal file
View File

@ -0,0 +1,11 @@
--- apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2017-02-02 18:55:08.000000000 +0100
+++ apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2017-09-29 17:32:14.444688494 +0200
@@ -169,7 +169,7 @@
Class.forName("java.net.Proxy");
javaVersion = JAVA_1_5;
javaVersionNumber++;
- Class.forName("java.net.CookieStore");
+ Class.forName("java.util.ServiceLoader");
javaVersion = JAVA_1_6;
javaVersionNumber++;
Class.forName("java.nio.file.FileSystem");