diff --git a/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch b/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
index 31fb1e1bfbdb98082f214dfd8a4d5fec46278c00..9eb8a10e941e1265ff41c1f2ad71513049de7167 100644
--- a/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
+++ b/Fix-compilation-failures-caused-by-hamcrest-upgrade.patch
@@ -1,5 +1,5 @@
---- build.xml.orig 2019-04-12 05:55:47.000000000 +0800
-+++ build.xml 2023-09-28 15:19:49.685986300 +0800
+--- build.xml 2022-10-20 09:56:05.289359798 -0600
++++ build.xml 2022-10-20 09:58:58.401255244 -0600
@@ -83,7 +83,7 @@
@@ -8,8 +8,8 @@
+
-
-@@ -228,7 +228,7 @@
+
+@@ -250,7 +250,7 @@
@@ -18,7 +18,7 @@
description="Initialize the environment for build and test. May require internet access."/>
-@@ -350,13 +350,11 @@
+@@ -375,13 +375,11 @@
diff --git a/icu4j-63.2.pom b/icu4j-73.2.pom
similarity index 95%
rename from icu4j-63.2.pom
rename to icu4j-73.2.pom
index b4dbb37f77085a5e80c761872bd2260e46bc33b9..098eb1c8466bf13be04aa1bb090d836f73fa30f3 100644
--- a/icu4j-63.2.pom
+++ b/icu4j-73.2.pom
@@ -1,7 +1,7 @@
@@ -9,19 +9,19 @@
com.ibm.icu
icu4j-charset
- 63.2
+ 73.2
ICU4J Charset Provider
icu4j-charset is a supplemental library for icu4j, implementing Java Charset SPI.
- http://icu-project.org/
+ https://icu.unicode.org/
2001
Unicode/ICU License
- https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE
+ https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE
repo
@@ -145,7 +145,7 @@
com.ibm.icu
icu4j
- 63.2
+ 73.2
-
\ No newline at end of file
+
diff --git a/icu4j-localespi-63.2.pom b/icu4j-localespi-73.2.pom
similarity index 94%
rename from icu4j-localespi-63.2.pom
rename to icu4j-localespi-73.2.pom
index c03948c260af4ebbe78b0d79c5a809bfd6f71a06..13d27ff4b7ba35c9d14a448bbb24c5669cae9545 100644
--- a/icu4j-localespi-63.2.pom
+++ b/icu4j-localespi-73.2.pom
@@ -1,7 +1,7 @@
@@ -9,19 +9,19 @@
com.ibm.icu
icu4j-localespi
- 63.2
+ 73.2
ICU4J Locale Service Provider
icu4j-localespi is a supplemental library for icu4j, implementing Java Locale SPI.
- http://icu-project.org/
+ https://icu.unicode.org/
2001
Unicode/ICU License
- https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE
+ https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE
repo
@@ -145,7 +145,7 @@
com.ibm.icu
icu4j
- 63.2
+ 73.2
-
\ No newline at end of file
+
diff --git a/icu4j.spec b/icu4j.spec
index 32495b1a99ce9523278833802c407748a4b32816..d1761eccaa1d29d49f5a18e52f0e61f48bbc16bb 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -1,13 +1,13 @@
%global gittag %(v=%{version}; echo "release-$v" | sed 's/\\./-/')
%global srctgz %(v=%{version}; echo "icu4j-$v" | sed 's/\\./_/')
Name: icu4j
-Version: 63.2
-Release: 2
+Version: 73.2
+Release: 1
Epoch: 1
Summary: International Components for Unicode for Java
-License: Unicode and MIT and BSD and Public Domain
+License: Unicode-DFS-2016 AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Public Domain
URL: https://github.com/unicode-org/icu/
-Source0: https://github.com/unicode-org/icu/releases/download/release-63-2/icu4j-63_2.tgz
+Source0: https://github.com/unicode-org/icu/releases/download/release-73-2/icu4j-73_2.tgz
Source1: https://repo1.maven.org/maven2/com/ibm/icu/icu4j/%{version}/icu4j-%{version}.pom
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
@@ -47,8 +47,8 @@ API documentation for %{name}.
%prep
%setup -q -c
-%patch0
-%patch1
+%patch0 -p0
+%patch1 -p0
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
@@ -56,11 +56,9 @@ rm main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
rm main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CoverageTest.java
+rm main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
rm main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java
rm main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorDisorderedMarksTest.java
-rm main/tests/charset/src/com/ibm/icu/dev/test/charset/TestSelection.java
-rm main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
-rm main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
%build
export JAVA_HOME=%{_jvmdir}/java/
@@ -94,6 +92,9 @@ install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/
%license main/shared/licenses/*
%changelog
+* Fri May 31 2024 yaoxin - 1:73.2-1
+- Upgrade to 73.2
+
* Thu Sep 28 2023 liyanan - 1:63.2-2
- Fixed compilation failures caused by hamcrest upgrade