Update timezone data to 2021a4

https://github.com/unicode-org/icu-data/tree/main/tzdata/icunew/2021a4/44

.gitignore

@@ -1,3 +1,8 @@
 /icu4c-5*-src.tgz
 /icu4c-6*-src.tgz
 /icu-config.sh
+/icu4c-69_1-data.zip
+/metaZones.txt
+/timezoneTypes.txt
+/windowsZones.txt
+/zoneinfo64.txt

icu.spec

@@ -2,13 +2,18 @@
 
 Name:      icu
 Version:   69.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   International Components for Unicode
 
 License:   MIT and UCD and Public Domain
 URL:       http://site.icu-project.org/
 Source0:   https://github.com/unicode-org/icu/releases/download/release-69-1/icu4c-69_1-src.tgz
-Source1:   icu-config.sh
+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
+Source10:   icu-config.sh
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -18,6 +23,7 @@ Requires: lib%{name}%{?_isa} = %{version}-%{release}
 
 Patch4: gennorm2-man.patch
 Patch5: icuinfo-man.patch
+Patch10: timezone-update.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -58,7 +64,11 @@ BuildArch: noarch
 
 %prep
 %autosetup -p1 -n %{name}
-
+pushd source
+unzip -o %{SOURCE1}
+rm -f data/in/icudt69l.dat
+cp -v -f %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} data/misc
+popd
 
 %build
 pushd source
@@ -104,7 +114,7 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
  cd $RPM_BUILD_ROOT%{_bindir}
  mv icu-config icu-config-%{__isa_bits}
 )
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config
+install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/icu-config
 
 
 %check
@@ -172,6 +182,9 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
 
 
 %changelog
+* Tue Feb 01 2022 Mike FABIAN <mfabian@redhat.com> - 69.1-4
+- Update timezone data to 2021a4
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 69.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

sources

@@ -1,2 +1,7 @@
-SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
+SHA512 (icu4c-69_1-data.zip) = 21c059d3e66d4c38fb3167c1b844fd8e6bad5bf2e4984170a888db63afda2296b73d91c21a4026bde4f8aefeecacf2e05bc061997844992bed989404387de317
+SHA512 (metaZones.txt) = df996db132b1219ea7bd51e746d94d9d85a51cf8ed6b544c8d804a01c50d2be7147637da9ba66c96fdb18db383841e29daafc56a2fbc1bb0a83871a143f4a77a
+SHA512 (timezoneTypes.txt) = 92b34b17333fd8b0c2c0d95eb05a2286da9e978d306eb2a816ea0142438b811896930fb2de4a650243b126391acc45ce923b2719e58815fbd49a47a28c5a39f9
+SHA512 (windowsZones.txt) = 0244076828692df657b48f05d0f1537ae0fb08f5f91ef8858e08097ce5df70363e11594ca24c735e71620504b68241ae4901a481ad59f1b6ec6b9eb28a30eda5
+SHA512 (zoneinfo64.txt) = 07a5f49a38e88d5b0298e98b335b08f256fe0db39506655303f8070d0590e5114dc426dd2e6c2e23ef2d646de1f2aa5a6dc3c1d893c3559b9e36f35ec4dccb2e
 SHA512 (icu-config.sh) = 04e00dbbd40c84ef355f149ab8d20dd0fa7fa7abacac849ea065ebab5de2746c13626e61f2a543c5207aa246a5805d2d9e64be9221a40eb8314d720c7824d314
+SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7

timezone-update.patch

@@ -0,0 +1,24 @@
+diff -ru icu.orig/source/test/cintltst/ccaltst.c icu/source/test/cintltst/ccaltst.c
+--- icu.orig/source/test/cintltst/ccaltst.c	2021-04-08 02:10:27.000000000 +0200
++++ icu/source/test/cintltst/ccaltst.c	2021-12-08 18:48:26.731171253 +0100
+@@ -274,7 +274,7 @@
+     tzver = ucal_getTZDataVersion(&status);
+     if (U_FAILURE(status)) {
+         log_err_status(status, "FAIL: ucal_getTZDataVersion() => %s\n", u_errorName(status));
+-    } else if (uprv_strlen(tzver) != 5 /*4 digits + 1 letter*/) {
++    } else if (uprv_strlen(tzver) != 5 /*4 digits + 1 letter*/ && uprv_strlen(tzver) != 6) {
+         log_err("FAIL: Bad version string was returned by ucal_getTZDataVersion\n");
+     } else {
+         log_verbose("PASS: ucal_getTZDataVersion returned %s\n", tzver);
+diff -ru icu.orig/source/test/intltest/tztest.cpp icu/source/test/intltest/tztest.cpp
+--- icu.orig/source/test/intltest/tztest.cpp	2021-04-08 02:10:27.000000000 +0200
++++ icu/source/test/intltest/tztest.cpp	2021-12-09 08:53:50.576419996 +0100
+@@ -152,7 +152,7 @@
+     const char* tzver = TimeZone::getTZDataVersion(status);
+     if (U_FAILURE(status)) {
+         errcheckln(status, "FAIL: getTZDataVersion failed - %s", u_errorName(status));
+-    } else if (uprv_strlen(tzver) != 5 /* 4 digits + 1 letter */) {
++    } else if (uprv_strlen(tzver) != 5 && uprv_strlen(tzver) != 6 /* 4 digits + 1 letter */) {
+         errln((UnicodeString)"FAIL: getTZDataVersion returned " + tzver);
+     } else {
+         logln((UnicodeString)"tzdata version: " + tzver);