[packages/java-hamcrest11] Rel 3

[arekm]

commit 76ab4ad441fa407444aa24c99aec4c49260330c5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 11 19:30:47 2026 +0100

    Rel 3

 build-modern-jdk.patch | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 java-hamcrest11.spec   |  8 ++-----
 javadoc-build.patch    | 22 ------------------
 3 files changed, 63 insertions(+), 28 deletions(-)
---
diff --git a/java-hamcrest11.spec b/java-hamcrest11.spec
index 739bfe9..f1ba329 100644
--- a/java-hamcrest11.spec
+++ b/java-hamcrest11.spec
@@ -15,7 +15,7 @@
 %undefine	with_javadoc
 %endif
 
-%define		rel	2
+%define		rel	3
 %define		srcname	hamcrest11
 Summary:	Hamcrest - a library of matchers
 Summary(pl.UTF-8):	Hamcrest - biblioteka klas dopasowujących
@@ -27,7 +27,7 @@ Group:		Libraries/Java
 Source0:	http://hamcrest.googlecode.com/files/hamcrest-%{version}.tgz
 # Source0-md5:	1bd4fd301c1a0dc748082378a59cb281
 Patch0:		hamcrest-nosrc.patch
-Patch1:		javadoc-build.patch
+Patch1:		build-modern-jdk.patch
 URL:		http://code.google.com/p/hamcrest/
 %if %{without binary}
 BuildRequires:	ant >= 1.6
@@ -99,10 +99,6 @@ Kod źródłowy biblioteki hamcrest 1.1.
 %{__rm} *.jar
 %endif
 
-# TODO: add new property (with this default value) do be override with -D
-# TODO: add build.properties support to build.xml
-%{__sed} -i -e 's,lib/generator/qdox-1.6.1.jar,${qdox.jar},g' build.xml
-
 %build
 export JAVA_HOME="%{java_home}"
 
diff --git a/build-modern-jdk.patch b/build-modern-jdk.patch
new file mode 100644
index 0000000..d336165
--- /dev/null
+++ b/build-modern-jdk.patch
@@ -0,0 +1,61 @@
+--- build.xml.orig	2010-11-16 18:20:30.000000000 +0100
++++ build.xml	2026-03-11 19:21:00.000000000 +0100
+@@ -26,20 +26,9 @@
+         <java-to-jar srcdir="hamcrest-generator/src/main/java"
+                      destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
+                      classpath="
+-                       lib/generator/qdox-1.6.1.jar;
++                       ${qdox.jar};
+                      "/>
+-        <taskdef name="jarjar"
+-                 classname="com.tonicsystems.jarjar.JarJarTask"
+-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
+-        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
+-             about it's existence. Uses JarJar to place classes under a different package
+-             to prevent conflict. -->
+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+-            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
+-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
+-            <rule pattern="com.thoughtworks.qdox.**"
+-                  result="org.hamcrest.generator.qdox. at 1"/>
+-        </jarjar>
++        <copy file="build/temp/hamcrest-generator-${version}-nodeps.jar" tofile="build/hamcrest-generator-${version}.jar"/>
+     </target>
+ 
+     <target name="core"
+@@ -55,6 +44,7 @@
+               classpath="
+                 build/hamcrest-core-${version}.jar;
+                 build/hamcrest-generator-${version}.jar;
++                ${qdox.jar};
+               ">
+             <arg value="core-matchers.xml"/>
+             <arg value="hamcrest-core/src/main/java"/>
+@@ -81,6 +71,7 @@
+               classpath="
+                 build/hamcrest-core-${version}.jar;
+                 build/hamcrest-generator-${version}.jar;
++                ${qdox.jar};
+                 build/hamcrest-library-${version}.jar;
+               ">
+             <arg value="matchers.xml"/>
+@@ -210,8 +201,7 @@
+ 
+ 	<target name="javadoc" depends="library">
+ 		<mkdir dir="build/javadoc"/>
+-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+-			overview="overview.html">
++		<javadoc destdir="build/javadoc" source="8" failonerror="no">
+ 			
+             <classpath>
+                 <fileset dir="lib/integration">
+@@ -223,7 +213,8 @@
+ 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+ 			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
+ 			<packageset dir="hamcrest-integration/src/main/java"/>
+-			<packageset dir="build/generated-code"/>
++			<packageset dir="build/temp/hamcrest-library/generated-code"/>
++			<packageset dir="build/temp/hamcrest-core/generated-code"/>
+ 			
+ 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
+ 			<group title="Matcher Library" packages="org.hamcrest.*"/>
diff --git a/javadoc-build.patch b/javadoc-build.patch
deleted file mode 100644
index 3f37fb4..0000000
--- a/javadoc-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 @@
- 
- 	<target name="javadoc" depends="library">
- 		<mkdir dir="build/javadoc"/>
--		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
--			overview="overview.html">
-+		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
- 			
-             <classpath>
-                 <fileset dir="lib/integration">
-@@ -208,7 +207,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"/>
--			<packageset dir="build/generated-code"/>
-+			<packageset dir="build/temp/hamcrest-library/generated-code"/>
-+			<packageset dir="build/temp/hamcrest-core/generated-code"/>
- 			
- 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
- 			<group title="Matcher Library" packages="org.hamcrest.*"/>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-hamcrest11.git/commitdiff/76ab4ad441fa407444aa24c99aec4c49260330c5