diff --git a/backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch b/backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch new file mode 100644 index 0000000000000000000000000000000000000000..c0b4060c053fefde13f0740071a9f676814b0d84 --- /dev/null +++ b/backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch @@ -0,0 +1,29 @@ +From b6b3e89231a623441940889b5badd90f74bdce2b Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Mon, 18 Sep 2023 20:20:42 -0700 +Subject: [PATCH] ICU-22512 Fix broken TestHebrewCalendarInTemporalLeapYear + +Fix broken test mistakenly landed in +https://github.com/unicode-org/icu/pull/2274 + +Some important steps were missed in the last landing. + +--- + source/test/intltest/caltest.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/test/intltest/caltest.cpp b/source/test/intltest/caltest.cpp +index 7518f11..ab63e75 100644 +--- a/source/test/intltest/caltest.cpp ++++ b/source/test/intltest/caltest.cpp +@@ -4006,6 +4006,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + leapTest->set(UCAL_MONTH, 0); + leapTest->set(UCAL_DATE, 1); + // If 10 months after TISHRI is TAMUZ, then it is a leap year. ++ leapTest->add(UCAL_MONTH, 10, status); + hasLeapMonth = leapTest->get(UCAL_MONTH, status) == icu::HebrewCalendar::TAMUZ; + yearForHasLeapMonth = cal_year; + } +-- +2.33.0 + diff --git a/icu.spec b/icu.spec index b61b6553ae3dcb3e4771c6431f8c0de375e1737b..78561d6b9d21c98f897730f27dbb1c3a450e3f53 100644 --- a/icu.spec +++ b/icu.spec @@ -1,6 +1,6 @@ Name: icu Version: 73.2 -Release: 2 +Release: 3 Summary: International Components for Unicode License: MIT and UCD and Public Domain URL: http://site.icu-project.org/ @@ -19,6 +19,7 @@ Patch4: 0001-add-support-loongarch64.patch %ifarch sw_64 Patch5: icu-Add-sw64-architecture.patch %endif +Patch6000: backport-Fix-broken-TestHebrewCalendarInTemporalLeapYear.patch Patch9000: delete-taboo-words.patch %description @@ -133,6 +134,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Tue Sep 19 2023 zhouwenpei - 73.2-3 +- Fix broken TestHebrewCalendarInTemporalLeapYear + * Mon Sep 11 2023 zhangpan - 73.2-2 - delete libicu*.so.72*