diff --git a/icu.spec b/icu.spec index 7a736a6..ab5425f 100644 --- a/icu.spec +++ b/icu.spec @@ -8,7 +8,7 @@ Name: icu Version: 71.1 -Release: 1%{?dist} +Release: 2%{?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-71-1/icu4c-71_1-src.tgz %if 0%{?use_tzdata_update} Source1: https://github.com/unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data.zip -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 +Source2: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/metaZones.txt +Source3: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/timezoneTypes.txt +Source4: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/windowsZones.txt +Source5: https://raw.githubusercontent.com/unicode-org/icu-data/main/tzdata/icunew/2022b/44/zoneinfo64.txt %endif Source10: icu-config.sh @@ -31,6 +31,7 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release} Patch4: gennorm2-man.patch Patch5: icuinfo-man.patch +Patch10: timezone-update-2022b.patch %description Tools and utilities for developing with icu. @@ -193,6 +194,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Fri Sep 23 2022 Mike FABIAN - 71.1-2 +- Update timezone data to 2022b + * Wed Jul 27 2022 Frantisek Zatloukal - 71.1-1 - Update to 71.1 diff --git a/sources b/sources index 0dfc006..7aefac1 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a -SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9 +SHA512 (metaZones.txt) = 339876ea759f84dcd77017a7592b12777f60f7556fda4f2d29fcfb674d816893d6ad9f91f8422fbf5746472fbeb15f4247446e37b5a6056ab2a662c204d7cf39 +SHA512 (timezoneTypes.txt) = 11fa693a0cc1a232ea23befdf9906f04896190210e85ecad82cd7b7dbdeb289dc6e2602a6d18bb035d7a7f7cbfaf8e57e7bbcd290fb10220751eaa7e7ebf500b SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5 -SHA512 (zoneinfo64.txt) = abd9a8eb932578d421af02430d167f2407cedd8d0b7b9d7eacaeb35252f9a690447761c5add4124fe759ffbb949343b800c582fef93adfedcd2f8e8d032960d4 +SHA512 (zoneinfo64.txt) = 289ac8dbdcdf39221d0cc41562134270433210658acd57d20c3ba3d727bfeba007ddcc7123634300b7a93cccafe8bb367f8c134e3414dc00d0dd309a29dd9373 SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314 SHA512 (icu4c-71_1-src.tgz) = 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912 SHA512 (icu4c-71_1-data.zip) = 05eb134a963a541a280e49e4d0aca07e480fef14daa0108c8fb9add18c150c9d34c8cbc46386c07909d511f7777eb3ea9f494001f191b84a7de0be8047da8b56 diff --git a/timezone-update-2022b.patch b/timezone-update-2022b.patch new file mode 100644 index 0000000..01d6038 --- /dev/null +++ b/timezone-update-2022b.patch @@ -0,0 +1,37 @@ +diff -ru icu.orig/source/test/intltest/tztest.cpp icu/source/test/intltest/tztest.cpp +--- icu.orig/source/test/intltest/tztest.cpp 2022-04-08 00:41:55.000000000 +0200 ++++ icu/source/test/intltest/tztest.cpp 2022-09-27 17:15:20.860744015 +0200 +@@ -2049,6 +2049,33 @@ + const char *alias; // link-from + const char *zone; // link-to (A zone ID with "Zone" rule) + } excluded1[] = { ++ {"Atlantic/Reykjavik", "Africa/Abidjan"}, ++ {"Iceland", "Africa/Abidjan"}, ++ {"Pacific/Chuuk", "Pacific/Port_Moresby"}, ++ {"Pacific/Truk", "Pacific/Port_Moresby"}, ++ {"Pacific/Yap", "Pacific/Port_Moresby"}, ++ {"Asia/Kashgar", "Anarctica/Vostok"}, ++ {"Asia/Urumqi", "Antarctica/Vostok"}, ++ {"Asia/Kuching", "Asia/Brunei"}, ++ {"Europe/Berlin", "Europe/Oslo"}, ++ {"Europe/Copenhagen", "Europe/Oslo"}, ++ {"Europe/Stockholm", "Europe/Oslo"}, ++ {"Europe/Brussels", "Europe/Amsterdam"}, ++ {"Europe/Luxembourg", "Europe/Amsterdam"}, ++ {"Europe/Monaco", "Europe/Paris"}, ++ {"Indian/Christmas", "Asia/Bangkok"}, ++ {"Indian/Cocos", "Asia/Rangoon"}, ++ {"Indian/Maldives", "Indian/Kerguelen"}, ++ {"Indian/Mahe", "Asia/Dubai"}, ++ {"Indian/Reunion", "Asia/Dubai"}, ++ {"Pacific/Majuro", "Pacific/Funafuti"}, ++ {"Pacific/Tarawa", "Pacific/Funafuti"}, ++ {"Pacific/Wake", "Pacific/Funafuti"}, ++ {"Pacific/Wallis", "Pacific/Funafuti"}, ++ {"Pacific/Pohnpei", "Pacific/Port_Moresby"}, ++ {"Pacific/Ponape", "Pacific/Guadalcanal"}, ++ {"Asia/Singapore", "Asia/Kuala_Lumpur"}, ++ {"Singapore", "Asia/Kuala_Lumpur"}, + {"Africa/Accra", "Africa/Abidjan"}, + {"Africa/Addis_Ababa", "Africa/Nairobi"}, + {"Africa/Asmera", "Africa/Nairobi"},