From fe4c662c73ac2a38f6064aa449dde72df490ef13 Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Thu, 28 Sep 2023 15:42:15 +0800
Subject: [PATCH] Fix compilation failures caused by hamcrest upgrade

---
 ...-failures-caused-by-hamcrest-upgrade.patch | 36 +++++++++++++++++++
 icu4j.spec                                    |  7 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 Fix-compilation-failures-caused-by-hamcrest-upgrade.patch

diff --git a/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch b/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
new file mode 100644
index 0000000..31fb1e1
--- /dev/null
+++ b/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2019-04-12 05:55:47.000000000 +0800
++++ build.xml	2023-09-28 15:19:49.685986300 +0800
+@@ -83,7 +83,7 @@
+     <property name="maven.doc.base.dir" value="${out.dir}/mavendoc"/>
+     <property name="cldr.util.out.dir" value="${out.dir}/cldr_util"/>
+     <property name="cldr.release.dir" value="release_cldr"/>
+-    <property name="external-jars" value="lib"/>
++    <property name="external-jars" value="/usr/share/java"/>
+ 
+     <!-- Java version check -->
+     <condition property="is.java7">
+@@ -228,7 +228,7 @@
+         <ivy:retrieve/>
+     </target>
+ 
+-    <target name="init" depends="test-init-junit-dependency"
++    <target name="init"
+             description="Initialize the environment for build and test. May require internet access."/>
+ 
+     <target name="_classifytests">
+@@ -350,13 +350,11 @@
+     </macrodef>
+ 
+     <property name="junit.out.dir" value="${out.dir}/junit-results"/>
+-    <property name="junit.core.jar" value="${external-jars}/junit-4.12.jar"/>
+-    <property name="junit.hamcrest.jar" value="${external-jars}/hamcrest-core-1.3.jar"/>
+-    <property name="junit.junitparams.jar" value="${external-jars}/JUnitParams-1.0.5.jar"/>
++    <property name="junit.core.jar" value="${external-jars}/junit.jar"/>
++    <property name="junit.hamcrest.jar" value="${external-jars}/hamcrest/hamcrest.jar"/>
+     <path id="junit.jars">
+         <pathelement path="${junit.core.jar}"/>
+         <pathelement path="${junit.hamcrest.jar}"/>
+-        <pathelement path="${junit.junitparams.jar}"/>
+     </path>
+ 
+     <path id="junit.icu.jars">
diff --git a/icu4j.spec b/icu4j.spec
index 50b1bec..32495b1 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -2,7 +2,7 @@
 %global srctgz %(v=%{version}; echo "icu4j-$v" | sed 's/\\./_/')
 Name:                icu4j
 Version:             63.2
-Release:             1
+Release:             2
 Epoch:               1
 Summary:             International Components for Unicode for Java
 License:             Unicode and MIT and BSD and Public Domain
@@ -12,6 +12,7 @@ Source1:             https://repo1.maven.org/maven2/com/ibm/icu/icu4j/%{version}
 Source2:             https://repo1.maven.org/maven2/com/ibm/icu/icu4j-charset/%{version}/icu4j-charset-%{version}.pom
 Source3:             https://repo1.maven.org/maven2/com/ibm/icu/icu4j-localespi/%{version}/icu4j-localespi-%{version}.pom
 Patch0:              improve-osgi-manifest.patch
+Patch1:              Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
 BuildRequires:       ant ant-junit java-javadoc javapackages-local ivy-local
 BuildArch:           noarch
 %description
@@ -47,6 +48,7 @@ API documentation for %{name}.
 %prep
 %setup -q -c
 %patch0
+%patch1
 sed -i -e 's/junit-4.12/junit-SYSTEM/' \
        -e 's/hamcrest-core-1.3/hamcrest-core-SYSTEM/' build.xml
 sed -i -e '/pl.pragmatists/d' ivy.xml
@@ -92,5 +94,8 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/
 %license main/shared/licenses/*
 
 %changelog
+* Thu Sep 28 2023 liyanan <thistleslyn@163.com> - 1:63.2-2
+- Fixed compilation failures caused by hamcrest upgrade
+
 * Sat Aug 1 2020 chengzihan <chengzihan2@huawei.com> - 63.2-1
 - Package init
-- 
Gitee