From e7a6c472da3f887621d5448ff4dd7ae16b0f00b6893ba51f027c206468bee979 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 3 Jun 2016 08:06:06 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=20

---
 hamcrest-1.3-javadoc.patch    |  8 --------
 hamcrest-1.3-no-doclint.patch | 12 ++++++++++++
 hamcrest.changes              |  8 +++++---
 hamcrest.spec                 |  5 +++++
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 hamcrest-1.3-no-doclint.patch

diff --git a/hamcrest-1.3-javadoc.patch b/hamcrest-1.3-javadoc.patch
index fade757..fa8b39b 100644
--- a/hamcrest-1.3-javadoc.patch
+++ b/hamcrest-1.3-javadoc.patch
@@ -26,11 +26,3 @@ Index: hamcrest-1.3/build.xml
          </javadoc>
          <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
              <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
-@@ -304,6 +304,7 @@
-                     <fileset file="build/hamcrest-generator-${version}.jar"/>
-                     <fileset file="build/hamcrest-integration-${version}.jar"/>
-                 </classpath>
-+                <arg value="-Xdoclint:none"/>
-             </javadoc>
-             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">
-                 <fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>
diff --git a/hamcrest-1.3-no-doclint.patch b/hamcrest-1.3-no-doclint.patch
new file mode 100644
index 0000000..b12798e
--- /dev/null
+++ b/hamcrest-1.3-no-doclint.patch
@@ -0,0 +1,12 @@
+Index: hamcrest-1.3/build.xml
+===================================================================
+--- hamcrest-1.3.orig/build.xml
++++ hamcrest-1.3/build.xml
+@@ -304,6 +304,7 @@
+                     <fileset file="build/hamcrest-generator-${version}.jar"/>
+                     <fileset file="build/hamcrest-integration-${version}.jar"/>
+                 </classpath>
++                <arg value="-Xdoclint:none"/>
+             </javadoc>
+             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">
+                 <fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>
diff --git a/hamcrest.changes b/hamcrest.changes
index fd199f1..72b477b 100644
--- a/hamcrest.changes
+++ b/hamcrest.changes
@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
-Thu Jun  2 15:33:14 UTC 2016 - dimstar@opensuse.org
+Fri Jun  3 08:04:27 UTC 2016 - fstrba@suse.com
 
-- Update hamcrest-1.3-javadoc.patch: Fix build with recent Java 1.8
-  by disabling doclint.
+- Added patch:
+  * hamcrest-1.3-no-doclint.patch:
+    - Fix build on systems that use recent Java 1.8 by disabling
+      doclint.
 
 -------------------------------------------------------------------
 Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com
diff --git a/hamcrest.spec b/hamcrest.spec
index 641f546..d7698a3 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -69,6 +69,8 @@ Patch2:         %{name}-%{version}-no-integration.patch
 Patch3:         %{name}-%{version}-javadoc.patch
 #PATCH-FIX-UPSTREAM: random build crash fix
 Patch4:         hamcrest-1.3-random-build-crash.patch
+#PATCH-FIX-OPENSUSE: disable doclint
+Patch5:         hamcrest-1.3-no-doclint.patch
 
 Requires:       java >= 1.6.0
 Requires:       qdox
@@ -164,6 +166,9 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
 %endif
 %patch3 -p1
 %patch4 -p1
+%if 0%{?suse_version} >= 1330
+%patch5 -p1
+%endif
 
 perl -pi -e 's/\r$//g' LICENSE.txt