Accepting request 557934 from Java:packages
Fix build with jdk10 OBS-URL: https://build.opensuse.org/request/show/557934 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamcrest?expand=0&rev=22
This commit is contained in:
commit
dce924c8d6
12
hamcrest-1.3-javadoc10.patch
Normal file
12
hamcrest-1.3-javadoc10.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- hamcrest-1.3/build.xml 2012-07-02 21:14:09.000000000 +0200
|
||||||
|
+++ hamcrest-1.3/build.xml 2017-12-18 07:46:06.290074242 +0100
|
||||||
|
@@ -165,9 +165,6 @@
|
||||||
|
|
||||||
|
<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
|
||||||
|
<group title="Matcher Library" packages="org.hamcrest.*"/>
|
||||||
|
-
|
||||||
|
- <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
|
||||||
|
- <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
|
||||||
|
</javadoc>
|
||||||
|
<jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
|
||||||
|
<fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 18 06:53:19 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* hamcrest-1.3-javadoc10.patch
|
||||||
|
+ Fix build with jdk10's javadoc that ends in error when a
|
||||||
|
link cannot be downloaded
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 8 06:05:24 UTC 2017 - fstrba@suse.com
|
Fri Sep 8 06:05:24 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -50,6 +50,7 @@ Patch3: %{name}-%{version}-javadoc.patch
|
|||||||
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
|
Patch6: hamcrest-1.3-javadoc9.patch
|
||||||
|
Patch7: hamcrest-1.3-javadoc10.patch
|
||||||
BuildRequires: ant >= 1.6.5
|
BuildRequires: ant >= 1.6.5
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
@ -98,6 +99,7 @@ ln -sf $(build-classpath qdox) lib/generator/
|
|||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
|
%patch7 -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