Fix build with java 9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=26
This commit is contained in:
parent
c9664b1583
commit
644316f566
1144
hamcrest-1.3-javadoc9.patch
Normal file
1144
hamcrest-1.3-javadoc9.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,8 +7,9 @@ Fri Sep 8 06:05:24 UTC 2017 - fstrba@suse.com
|
|||||||
with jdk9
|
with jdk9
|
||||||
- Specify java source level 1.6 in order to allow building with
|
- Specify java source level 1.6 in order to allow building with
|
||||||
jdk9
|
jdk9
|
||||||
- Require java-1_8_0-openjdk-devel since javadoc errors are fatal
|
- Added patch:
|
||||||
in jdk9
|
* hamcrest-1.3-javadoc9.patch
|
||||||
|
+ fix javadoc errors that are fatal in jdk9
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com
|
Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com
|
||||||
|
@ -49,9 +49,9 @@ Patch3: %{name}-%{version}-javadoc.patch
|
|||||||
#PATCH-FIX-UPSTREAM: random build crash fix
|
#PATCH-FIX-UPSTREAM: random build crash fix
|
||||||
Patch4: hamcrest-1.3-random-build-crash.patch
|
Patch4: hamcrest-1.3-random-build-crash.patch
|
||||||
Patch5: hamcrest-1.3-fork-javac.patch
|
Patch5: hamcrest-1.3-fork-javac.patch
|
||||||
|
Patch6: hamcrest-1.3-javadoc9.patch
|
||||||
BuildRequires: ant >= 1.6.5
|
BuildRequires: ant >= 1.6.5
|
||||||
# Disable this one whenever the javadoc build is fixed for jdk9
|
BuildRequires: java-devel >= 1.6.0
|
||||||
BuildRequires: java-1_8_0-openjdk-devel
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: qdox
|
BuildRequires: qdox
|
||||||
@ -97,6 +97,7 @@ ln -sf $(build-classpath qdox) lib/generator/
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
perl -pi -e 's/\r$//g' LICENSE.txt
|
perl -pi -e 's/\r$//g' LICENSE.txt
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user