diff --git a/hamcrest-1.3-javadoc10.patch b/hamcrest-1.3-javadoc10.patch new file mode 100644 index 0000000..ca2236f --- /dev/null +++ b/hamcrest-1.3-javadoc10.patch @@ -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 @@ + + + +- +- +- + + + diff --git a/hamcrest.changes b/hamcrest.changes index dec15b5..7195bb8 100644 --- a/hamcrest.changes +++ b/hamcrest.changes @@ -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 diff --git a/hamcrest.spec b/hamcrest.spec index 9e723e9..19b4f93 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -50,6 +50,7 @@ Patch3: %{name}-%{version}-javadoc.patch Patch4: hamcrest-1.3-random-build-crash.patch Patch5: hamcrest-1.3-fork-javac.patch Patch6: hamcrest-1.3-javadoc9.patch +Patch7: hamcrest-1.3-javadoc10.patch BuildRequires: ant >= 1.6.5 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local @@ -98,6 +99,7 @@ ln -sf $(build-classpath qdox) lib/generator/ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 perl -pi -e 's/\r$//g' LICENSE.txt