[packages/java-hamcrest] Rel 3

[arekm]

commit cd52103995c404a23bf26f978b9111ff409e7cb1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 13:03:32 2026 +0200

    Rel 3

 java-hamcrest.spec  |  6 ++++--
 javadoc-build.patch | 29 ++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/java-hamcrest.spec b/java-hamcrest.spec
index 41fa6c7..cb9e2e6 100644
--- a/java-hamcrest.spec
+++ b/java-hamcrest.spec
@@ -9,13 +9,15 @@
 %bcond_with	binary		# do not compile .jars from source use bundled ones
 %bcond_with	bootstrap	# break BR loop (java-junit, java-qdox)
 
+%{?use_default_jdk:%use_default_jdk 8}
+
 %if %{with bootstrap}
 %define		with_binary	1
 %undefine	with_tests
 %undefine	with_javadoc
 %endif
 
-%define		rel	2
+%define		rel	3
 %define		srcname	hamcrest
 Summary:	Hamcrest - a library of matchers
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
@@ -34,7 +36,7 @@ BuildRequires:	ant >= 1.6
 %{?with_tests:BuildRequires:	ant-junit >= 1.6}
 %{?with_tests:BuildRequires:	java-junit}
 BuildRequires:	java-qdox
-BuildRequires:	jdk
+%buildrequires_jdk
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
diff --git a/javadoc-build.patch b/javadoc-build.patch
index 3f37fb4..329e7ed 100644
--- a/javadoc-build.patch
+++ b/javadoc-build.patch
@@ -1,16 +1,31 @@
---- build.xml.orig	2010-04-20 11:10:14.000000000 +0200
-+++ build.xml	2010-04-20 11:15:13.000000000 +0200
-@@ -196,8 +196,7 @@
- 
+--- build.xml.orig	2026-04-04 12:39:30.259754906 +0200
++++ build.xml	2026-04-04 12:39:30.289902833 +0200
+@@ -56,6 +56,7 @@
+                 build/hamcrest-core-${version}.jar;
+                 build/hamcrest-generator-${version}.jar;
+               ">
++            <jvmarg value="-noverify"/>
+             <arg value="core-matchers.xml"/>
+             <arg value="hamcrest-core/src/main/java"/>
+             <arg value="org.hamcrest.CoreMatchers"/>
+@@ -83,6 +84,7 @@
+                 build/hamcrest-generator-${version}.jar;
+                 build/hamcrest-library-${version}.jar;
+               ">
++            <jvmarg value="-noverify"/>
+             <arg value="matchers.xml"/>
+             <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
+             <arg value="org.hamcrest.Matchers"/>
+@@ -197,7 +199,7 @@
  	<target name="javadoc" depends="library">
  		<mkdir dir="build/javadoc"/>
--		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+ 		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
 -			overview="overview.html">
-+		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
++			additionalparam="-Xdoclint:none">
  			
              <classpath>
                  <fileset dir="lib/integration">
-@@ -208,7 +207,8 @@
+@@ -208,7 +210,8 @@
  			<packageset dir="hamcrest-core/src/main/java"/>
  			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
  			<packageset dir="hamcrest-integration/src/main/java"/>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-hamcrest.git/commitdiff/cd52103995c404a23bf26f978b9111ff409e7cb1