Accepting request 399939 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/399939
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=21

hamcrest-1.3-javadoc.patch

@@ -18,11 +18,3 @@ Index: hamcrest-1.3/build.xml
  
          <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
                   destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
-@@ -149,6 +148,7 @@
-             
-             <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-             <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
-+            <arg value="-Xdoclint:none"/>
-         </javadoc>
-         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
-             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

hamcrest-1.3-no-doclint.patch

@@ -1,12 +0,0 @@
-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"/>

hamcrest.changes

@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Fri Jun  3 08:04:27 UTC 2016 - fstrba@suse.com
-
-- 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
 

hamcrest.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hamcrest
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -69,8 +69,6 @@ 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
@@ -166,9 +164,6 @@ 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