diff --git a/icu.spec b/icu.spec index 4e63e24..82e81f6 100644 --- a/icu.spec +++ b/icu.spec @@ -8,7 +8,7 @@ Name: icu Version: 69.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: International Components for Unicode License: MIT and UCD and Public Domain @@ -16,10 +16,10 @@ URL: http://site.icu-project.org/ Source0: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz %if 0%{?use_tzdata_update} Source1: https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-data.zip -Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2021a4/44/metaZones.txt -Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2021a4/44/timezoneTypes.txt -Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2021a4/44/windowsZones.txt -Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2021a4/44/zoneinfo64.txt +Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/metaZones.txt +Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/timezoneTypes.txt +Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/windowsZones.txt +Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022a/44/zoneinfo64.txt %endif Source10: icu-config.sh @@ -32,6 +32,7 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release} Patch4: gennorm2-man.patch Patch5: icuinfo-man.patch Patch10: timezone-update.patch +Patch11: timezone-update-2022a.patch %description Tools and utilities for developing with icu. @@ -192,6 +193,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Thu May 05 2022 Mike FABIAN - 69.1-6 +- Update timezone data to 2022a + * Wed Feb 02 2022 Eike Rathke - 69.1-5 - Introduce use_tzdata_update flag diff --git a/sources b/sources index 1818b35..ea612ff 100644 --- a/sources +++ b/sources @@ -2,6 +2,6 @@ SHA512 (icu4c-69_1-data.zip) = 21c059d3e66d4c38fb3167c1b844fd8e6bad5bf2e4984170a SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9 SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5 -SHA512 (zoneinfo64.txt) = 07a5f49a38e88d5b0298e98b335b08f256fe0db39506655303f8070d0590e5114dc426dd2e6c2e23ef2d646de1f2aa5a6dc3c1d893c3559b9e36f35ec4dccb2e +SHA512 (zoneinfo64.txt) = abd9a8eb932578d421af02430d167f2407cedd8d0b7b9d7eacaeb35252f9a690447761c5add4124fe759ffbb949343b800c582fef93adfedcd2f8e8d032960d4 SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314 SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 diff --git a/timezone-update-2022a.patch b/timezone-update-2022a.patch new file mode 100644 index 0000000..147a5b4 --- /dev/null +++ b/timezone-update-2022a.patch @@ -0,0 +1,30 @@ +diff -ru icu.orig/source/test/intltest/tztest.cpp icu/source/test/intltest/tztest.cpp +--- icu.orig/source/test/intltest/tztest.cpp 2022-05-04 17:26:12.863669497 +0200 ++++ icu/source/test/intltest/tztest.cpp 2022-05-05 12:37:17.599192452 +0200 +@@ -2011,6 +2011,25 @@ + const char *alias; + const char *zone; + } excluded1[] = { ++ {"Africa/Accra", "Africa/Abidjan"}, ++ {"America/Blanc-Sablon", "America/Port_of_Spain"}, ++ {"America/Curacao", "America/Port_of_Spain"}, ++ {"America/Kralendijk", "America/Port_of_Spain"}, ++ {"America/Lower_Princes", "America/Port_of_Spain"}, ++ {"America/Puerto_Rico", "America/Port_of_Spain"}, ++ {"PRT", "America/Port_of_Spain"}, ++ {"America/Aruba", "America/Port_of_Spain"}, ++ {"America/Cayman", "America/Coral_Harbour"}, ++ {"America/Panama", "America/Coral_Harbour"}, ++ {"America/Curacao", "America/Port_of_Spain"}, ++ {"America/Phoenix", "America/Creston"}, ++ {"America/Nassau", "America/Montreal"}, ++ {"Pacific/Port_Moresby", "Antarctica/DumontDUrville"}, ++ {"Asia/Aden", "Antarctica/Syowa"}, ++ {"Asia/Kuwait", "Antarctica/Syowa"}, ++ {"Asia/Riyadh", "Antarctica/Syowa"}, ++ {"US/Arizona", "America/Creston"}, ++ {"PNT", "America/Creston"}, + {"Africa/Addis_Ababa", "Africa/Nairobi"}, + {"Africa/Asmera", "Africa/Nairobi"}, + {"Africa/Bamako", "Africa/Abidjan"}, +icu/source/test/intltest のみに存在: tztest.cpp.~1~