diff --git a/backport-Rename-Europe-Kiev-to-Europe-Kyiv.patch b/backport-Rename-Europe-Kiev-to-Europe-Kyiv.patch new file mode 100644 index 0000000000000000000000000000000000000000..f98d4604e38d70c34685f2f299111c8f213391de --- /dev/null +++ b/backport-Rename-Europe-Kiev-to-Europe-Kyiv.patch @@ -0,0 +1,139 @@ +From e13e9c531fc48a04fb8d064acccc9f8ae68d5544 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 12 Apr 2022 17:22:41 -0700 +Subject: [PATCH] Rename Europe/Kiev to Europe/Kyiv +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Most recent English-language publications seem to use "Kyiv". +Although I used Google to attempt to count how popular each +spelling was, these attempts failed because Google now +automatically searches for both spellings if you give either. +Worse, it seems even to present results that alter the spelling. +For example, I searched for "Kiev" (with quotes) and the first +headline that Google News reported was "Boris Johnson Tours Kiev"; +but when I visited the referenced article the headline was +actually "Boris Johnson Tours Kyiv". In this situation, Google’s +famed numeric counts don’t mean much. + +For what it’s worth, I counted results by hand in a plain Google +search for Kiev in which I followed all the links, and 14 of the +19 hits in the first two pages of results preferred the spelling +"Kyiv"; when I searched for Kyiv, every hit in the first two pages +of results preferred "Kyiv". This indicates a strong preference +for "Kyiv". +* NEWS: Mention this. +* backward (Europe/Kiev): New link. +* europe, zone.tab, zone1970.tab (Europe/Kyiv): +Rename from Europe/Kiev. +--- + backward | 1 + + europe | 30 +++++++++++++++--------------- + theory.html | 2 +- + zone.tab | 2 +- + zone1970.tab | 2 +- + 5 files changed, 27 insertions(+), 18 deletions(-) + +diff --git a/backward b/backward +index 7685c7429..a8fd620b6 100644 +--- a/backward ++++ b/backward +@@ -83,6 +83,7 @@ Link Africa/Cairo Egypt + Link Europe/Dublin Eire + Link Etc/UTC Etc/UCT + Link Europe/London Europe/Belfast ++Link Europe/Kyiv Europe/Kiev + Link Europe/Chisinau Europe/Tiraspol + Link Europe/London GB + Link Europe/London GB-Eire +diff --git a/europe b/europe +index 5051260c3..5bc994552 100644 +--- a/europe ++++ b/europe +@@ -4116,23 +4116,23 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. + # * Ukrainian Government's Resolution of 20.03.1992, No. 139. + # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm + +-# From Paul Eggert (2018-10-03): ++# From Paul Eggert (2022-04-12): + # As is usual in tzdb, Ukrainian zones use the most common English spellings. +-# For example, tzdb uses Europe/Kiev, as "Kiev" is the most common spelling in +-# English for Ukraine's capital, even though it is certainly wrong as a +-# transliteration of the Ukrainian "Київ". This is similar to tzdb's use of +-# Europe/Prague, which is certainly wrong as a transliteration of the Czech +-# "Praha". ("Kiev" came from old Slavic via Russian to English, and "Prague" +-# came from old Slavic via French to English, so the two cases have something +-# in common.) Admittedly English-language spelling of Ukrainian names is +-# controversial, and some day "Kyiv" may become substantially more popular in +-# English; in the meantime, stick with the traditional English "Kiev" as that +-# means less disruption for our users. ++# In particular, tzdb's name Europe/Kyiv uses the most common spelling in ++# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev, ++# "Kyiv" is now more common due to widespread reporting of the current conflict. ++# Conversely, tzdb continues to use traditional spellings in Europe/Uzhgorod and ++# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is ++# certainly wrong as a transliteration of the Czech "Praha". ++# English-language spelling of Ukrainian names is in flux, and ++# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more ++# popular in English; in the meantime, stick with the traditional ++# English spellings as that means less disruption for our users. + + # Zone NAME STDOFF RULES FORMAT [UNTIL] +-# This represents most of Ukraine. See above for the spelling of "Kiev". +-Zone Europe/Kiev 2:02:04 - LMT 1880 +- 2:02:04 - KMT 1924 May 2 # Kiev Mean Time ++# This represents most of Ukraine. See above for the spelling of "Kyiv". ++Zone Europe/Kyiv 2:02:04 - LMT 1880 ++ 2:02:04 - KMT 1924 May 2 # Kyiv Mean Time + 2:00 - EET 1930 Jun 21 + 3:00 - MSK 1941 Sep 20 + 1:00 C-Eur CE%sT 1943 Nov 6 +@@ -4155,7 +4155,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct + 2:00 C-Eur EE%sT 1996 May 13 + 2:00 EU EE%sT + # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. +-# "Zaporizhia" is the transliteration of the Ukrainian name, but ++# "Zaporizhzhia" is the transliteration of the Ukrainian name, but + # "Zaporozh'ye" is more common in English. Use the common English + # spelling, except omit the apostrophe as it is not allowed in + # portable Posix file names. +diff --git a/theory.html b/theory.html +index 28cc88eaf..22cd36d09 100644 +--- a/theory.html ++++ b/theory.html +@@ -502,7 +502,7 @@

Time zone abbreviations

+ HMT Havana, Helsinki, Horta, Howrah; + IMT Irkutsk, Istanbul; + JMT Jerusalem; +- KMT Kaunas, Kiev, Kingston; ++ KMT Kaunas, Kyiv, Kingston; + LMT Lima, Lisbon, local, Luanda; + MMT Macassar, Madras, Malé, Managua, Minsk, Monrovia, Montevideo, + Moratuwa, Moscow; +diff --git a/zone.tab b/zone.tab +index a80e5d7d1..1f73ddaf8 100644 +--- a/zone.tab ++++ b/zone.tab +@@ -400,7 +400,7 @@ TT +1039-06131 America/Port_of_Spain + TV -0831+17913 Pacific/Funafuti + TW +2503+12130 Asia/Taipei + TZ -0648+03917 Africa/Dar_es_Salaam +-UA +5026+03031 Europe/Kiev Ukraine (most areas) ++UA +5026+03031 Europe/Kyiv Ukraine (most areas) + UA +4837+02218 Europe/Uzhgorod Transcarpathia + UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk + UG +0019+03225 Africa/Kampala +diff --git a/zone1970.tab b/zone1970.tab +index 0df9cbe5a..aa7e9c499 100644 +--- a/zone1970.tab ++++ b/zone1970.tab +@@ -330,7 +330,7 @@ TO -210800-1751200 Pacific/Tongatapu + TR +4101+02858 Europe/Istanbul + TV -0831+17913 Pacific/Funafuti + TW +2503+12130 Asia/Taipei +-UA +5026+03031 Europe/Kiev Ukraine (most areas) ++UA +5026+03031 Europe/Kyiv Ukraine (most areas) + UA +4837+02218 Europe/Uzhgorod Transcarpathia + UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk + UM +1917+16637 Pacific/Wake Wake Island diff --git a/tzdata.spec b/tzdata.spec index f802fe9a08bace2e8620030f7968ca10866816d8..339345bf2b1759436ac5ef11aaccdc9cda19c052 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 20 +Release: 21 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -35,6 +35,7 @@ Patch6024: backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch Patch6025: backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch Patch6026: backport-Ays-n-Region-moves-from-04-03-to-03-new-zone.patch Patch6027: backport-Improve-recent-commentary-for-Chilean-decrees.patch +Patch6028: backport-Rename-Europe-Kiev-to-Europe-Kyiv.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -137,6 +138,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Sep 26 2025 Funda Wang - 2022a-21 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Rename Europe/Kiev to Europe/Kyiv + * Fri Mar 28 2025 langfei - 2022a-20 - Type:bugfix - CVE:NA