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 0000000000000000000000000000000000000000..31fb1e1bfbdb98082f214dfd8a4d5fec46278c00 --- /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 @@ + + + +- ++ + + + +@@ -228,7 +228,7 @@ + + + +- + + +@@ -350,13 +350,11 @@ + + + +- +- +- ++ ++ + + + +- + + + diff --git a/icu4j.spec b/icu4j.spec index 50b1beca25d02be85f321701474f5fd6b15a5075..32495b1a99ce9523278833802c407748a4b32816 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 - 1:63.2-2 +- Fixed compilation failures caused by hamcrest upgrade + * Sat Aug 1 2020 chengzihan - 63.2-1 - Package init