diff --git a/icu.spec b/icu.spec index bb8bf78..e49eab8 100644 --- a/icu.spec +++ b/icu.spec @@ -8,7 +8,7 @@ Name: icu Version: 73.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: International Components for Unicode License: Unicode-DFS-2016 AND BSD-2-Clause AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain @@ -23,6 +23,10 @@ Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/ic %endif Source10: icu-config.sh +# Fix broken TestHebrewCalendarInTemporalLeapYear +# https://github.com/unicode-org/icu/pull/2610 (fixed in icu 74) +Patch0: intltest-fix-hebrew-cal.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: doxygen, autoconf, python3 @@ -193,6 +197,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Wed Dec 13 2023 Yaakov Selkowitz - 73.2-3 +- Fix broken TestHebrewCalendarInTemporalLeapYear + * Thu Jul 20 2023 Fedora Release Engineering - 73.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/intltest-fix-hebrew-cal.patch b/intltest-fix-hebrew-cal.patch new file mode 100644 index 0000000..41f3ce0 --- /dev/null +++ b/intltest-fix-hebrew-cal.patch @@ -0,0 +1,33 @@ +From f3b869cbb0b9ced42d7ca4e24626a868a14ddcfc 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. +--- + icu4c/source/test/intltest/caltest.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp +index 9d89f468eef0..18b96f231ba3 100644 +--- a/source/test/intltest/caltest.cpp ++++ b/source/test/intltest/caltest.cpp +@@ -4028,6 +4028,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + for (gc.set(startYear, UCAL_JANUARY, 1); + gc.get(UCAL_YEAR, status) <= stopYear; + gc.add(UCAL_DATE, incrementDays, status)) { ++ cal->setTime(gc.getTime(status), status); + if (failure(status, "add/get/set/getTime/setTime incorrect")) return; + + int32_t cal_year = cal->get(UCAL_EXTENDED_YEAR, status); +@@ -4036,6 +4037,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; + }