diff --git a/backport-Morocco-springs-forward-on-05-31-not-05-24.patch b/backport-Morocco-springs-forward-on-05-31-not-05-24.patch deleted file mode 100644 index e13c81cb7ff413c589b9e0e7c5b44c5c17ae9867..0000000000000000000000000000000000000000 --- a/backport-Morocco-springs-forward-on-05-31-not-05-24.patch +++ /dev/null @@ -1,160 +0,0 @@ -From f9aacafa4f15be6e7ff4436164e14d8f08839ac7 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 14 Apr 2020 22:20:53 -0700 -Subject: [PATCH 33/35] Morocco springs forward on 05-31, not 05-24. - -(Thanks to Semlali Naoufal.) -* NEWS: Mention this. -* africa (Morocco): Delay the spring-forward date by a ween -in 2020, 2028, 2035, etc. ---- - africa | 50 ++++++++++++++++++++++++++++---------------------- - 1 files changed, 28 insertions(+), 22 deletions(-) - -diff --git a/africa b/africa -index f6e7a04..724744f 100644 ---- a/africa -+++ b/africa -@@ -867,19 +867,25 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis - # Morocco will be on GMT starting from Sunday, May 5th 2019 at 3am. - # The switch to GMT+1 will occur on Sunday, June 9th 2019 at 2am.... - # http://fr.le360.ma/societe/voici-la-date-du-retour-a-lheure-legale-au-maroc-188222 --# --# From Paul Eggert (2019-05-20): --# This agrees with our 2018-11-01 guess that the Moroccan government --# would continue the practice of falling back at 03:00 the last Sunday --# before Ramadan, and of springing forward at 02:00 the first Sunday after --# Ramadan, as this has been the practice since 2012. To implement this, --# transition dates for 2019 through 2087 were determined by running the --# following program under GNU Emacs 26.2. --# (let ((islamic-year 1440)) -+ -+# From Semlali Naoufal (2020-04-14): -+# Following the announcement by the Moroccan government, the switch to -+# GMT time will take place on Sunday, April 19, 2020 from 3 a.m. and -+# the return to GMT+1 time will take place on Sunday, May 31, 2020 at 2 a.m.... -+# https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dimanche-prochain/ -+# http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-prochain-1 -+# -+# From Paul Eggert (2020-04-14): -+# For now, guess that in the future Morocco will fall back at 03:00 -+# the last Sunday before Ramadan, and spring forward at 02:00 the -+# first Sunday after the day after Ramadan. To implement this, -+# transition dates for 2021 through 2087 were determined by running -+# the following program under GNU Emacs 26.3. -+# (let ((islamic-year 1442)) - # (require 'cal-islam) - # (while (< islamic-year 1511) - # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) --# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -+# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year)))) - # (sunday 0)) - # (while (/= sunday (mod (setq a (1- a)) 7))) - # (while (/= sunday (mod b 7)) -@@ -939,7 +945,7 @@ Rule Morocco 2018 only - Jun 17 2:00 1:00 - - Rule Morocco 2019 only - May 5 3:00 -1:00 - - Rule Morocco 2019 only - Jun 9 2:00 0 - - Rule Morocco 2020 only - Apr 19 3:00 -1:00 - --Rule Morocco 2020 only - May 24 2:00 0 - -+Rule Morocco 2020 only - May 31 2:00 0 - - Rule Morocco 2021 only - Apr 11 3:00 -1:00 - - Rule Morocco 2021 only - May 16 2:00 0 - - Rule Morocco 2022 only - Mar 27 3:00 -1:00 - -@@ -955,7 +961,7 @@ Rule Morocco 2026 only - Mar 22 2:00 0 - - Rule Morocco 2027 only - Feb 7 3:00 -1:00 - - Rule Morocco 2027 only - Mar 14 2:00 0 - - Rule Morocco 2028 only - Jan 23 3:00 -1:00 - --Rule Morocco 2028 only - Feb 27 2:00 0 - -+Rule Morocco 2028 only - Mar 5 2:00 0 - - Rule Morocco 2029 only - Jan 14 3:00 -1:00 - - Rule Morocco 2029 only - Feb 18 2:00 0 - - Rule Morocco 2029 only - Dec 30 3:00 -1:00 - -@@ -971,7 +977,7 @@ Rule Morocco 2033 only - Dec 25 2:00 0 - - Rule Morocco 2034 only - Nov 5 3:00 -1:00 - - Rule Morocco 2034 only - Dec 17 2:00 0 - - Rule Morocco 2035 only - Oct 28 3:00 -1:00 - --Rule Morocco 2035 only - Dec 2 2:00 0 - -+Rule Morocco 2035 only - Dec 9 2:00 0 - - Rule Morocco 2036 only - Oct 19 3:00 -1:00 - - Rule Morocco 2036 only - Nov 23 2:00 0 - - Rule Morocco 2037 only - Oct 4 3:00 -1:00 - -@@ -987,7 +993,7 @@ Rule Morocco 2041 only - Sep 29 2:00 0 - - Rule Morocco 2042 only - Aug 10 3:00 -1:00 - - Rule Morocco 2042 only - Sep 21 2:00 0 - - Rule Morocco 2043 only - Aug 2 3:00 -1:00 - --Rule Morocco 2043 only - Sep 6 2:00 0 - -+Rule Morocco 2043 only - Sep 13 2:00 0 - - Rule Morocco 2044 only - Jul 24 3:00 -1:00 - - Rule Morocco 2044 only - Aug 28 2:00 0 - - Rule Morocco 2045 only - Jul 9 3:00 -1:00 - -@@ -1003,7 +1009,7 @@ Rule Morocco 2049 only - Jul 4 2:00 0 - - Rule Morocco 2050 only - May 15 3:00 -1:00 - - Rule Morocco 2050 only - Jun 26 2:00 0 - - Rule Morocco 2051 only - May 7 3:00 -1:00 - --Rule Morocco 2051 only - Jun 11 2:00 0 - -+Rule Morocco 2051 only - Jun 18 2:00 0 - - Rule Morocco 2052 only - Apr 28 3:00 -1:00 - - Rule Morocco 2052 only - Jun 2 2:00 0 - - Rule Morocco 2053 only - Apr 13 3:00 -1:00 - -@@ -1019,7 +1025,7 @@ Rule Morocco 2057 only - Apr 8 2:00 0 - - Rule Morocco 2058 only - Feb 17 3:00 -1:00 - - Rule Morocco 2058 only - Mar 31 2:00 0 - - Rule Morocco 2059 only - Feb 9 3:00 -1:00 - --Rule Morocco 2059 only - Mar 16 2:00 0 - -+Rule Morocco 2059 only - Mar 23 2:00 0 - - Rule Morocco 2060 only - Feb 1 3:00 -1:00 - - Rule Morocco 2060 only - Mar 7 2:00 0 - - Rule Morocco 2061 only - Jan 16 3:00 -1:00 - -@@ -1029,13 +1035,13 @@ Rule Morocco 2062 only - Feb 12 2:00 0 - - Rule Morocco 2062 only - Dec 31 3:00 -1:00 - - Rule Morocco 2063 only - Feb 4 2:00 0 - - Rule Morocco 2063 only - Dec 16 3:00 -1:00 - --Rule Morocco 2064 only - Jan 20 2:00 0 - -+Rule Morocco 2064 only - Jan 27 2:00 0 - - Rule Morocco 2064 only - Dec 7 3:00 -1:00 - - Rule Morocco 2065 only - Jan 11 2:00 0 - - Rule Morocco 2065 only - Nov 22 3:00 -1:00 - - Rule Morocco 2066 only - Jan 3 2:00 0 - - Rule Morocco 2066 only - Nov 14 3:00 -1:00 - --Rule Morocco 2066 only - Dec 19 2:00 0 - -+Rule Morocco 2066 only - Dec 26 2:00 0 - - Rule Morocco 2067 only - Nov 6 3:00 -1:00 - - Rule Morocco 2067 only - Dec 11 2:00 0 - - Rule Morocco 2068 only - Oct 21 3:00 -1:00 - -@@ -1045,13 +1051,13 @@ Rule Morocco 2069 only - Nov 17 2:00 0 - - Rule Morocco 2070 only - Oct 5 3:00 -1:00 - - Rule Morocco 2070 only - Nov 9 2:00 0 - - Rule Morocco 2071 only - Sep 20 3:00 -1:00 - --Rule Morocco 2071 only - Oct 25 2:00 0 - -+Rule Morocco 2071 only - Nov 1 2:00 0 - - Rule Morocco 2072 only - Sep 11 3:00 -1:00 - - Rule Morocco 2072 only - Oct 16 2:00 0 - - Rule Morocco 2073 only - Aug 27 3:00 -1:00 - - Rule Morocco 2073 only - Oct 8 2:00 0 - - Rule Morocco 2074 only - Aug 19 3:00 -1:00 - --Rule Morocco 2074 only - Sep 23 2:00 0 - -+Rule Morocco 2074 only - Sep 30 2:00 0 - - Rule Morocco 2075 only - Aug 11 3:00 -1:00 - - Rule Morocco 2075 only - Sep 15 2:00 0 - - Rule Morocco 2076 only - Jul 26 3:00 -1:00 - -@@ -1061,7 +1067,7 @@ Rule Morocco 2077 only - Aug 22 2:00 0 - - Rule Morocco 2078 only - Jul 10 3:00 -1:00 - - Rule Morocco 2078 only - Aug 14 2:00 0 - - Rule Morocco 2079 only - Jun 25 3:00 -1:00 - --Rule Morocco 2079 only - Jul 30 2:00 0 - -+Rule Morocco 2079 only - Aug 6 2:00 0 - - Rule Morocco 2080 only - Jun 16 3:00 -1:00 - - Rule Morocco 2080 only - Jul 21 2:00 0 - - Rule Morocco 2081 only - Jun 1 3:00 -1:00 - -@@ -1077,7 +1083,7 @@ Rule Morocco 2085 only - May 27 2:00 0 - - Rule Morocco 2086 only - Apr 14 3:00 -1:00 - - Rule Morocco 2086 only - May 19 2:00 0 - - Rule Morocco 2087 only - Mar 30 3:00 -1:00 - --Rule Morocco 2087 only - May 4 2:00 0 - -+Rule Morocco 2087 only - May 11 2:00 0 - - # For dates after the somewhat-arbitrary cutoff of 2087, assume that - # Morocco will no longer observe DST. At some point this table will - # need to be extended, though quite possibly Morocco will change the --- -2.19.1 - diff --git a/backport-Rename-America-Godthab-to-America-Nuuk.patch b/backport-Rename-America-Godthab-to-America-Nuuk.patch deleted file mode 100644 index f179ce682b48c92cce7e8839b27b9487d3797953..0000000000000000000000000000000000000000 --- a/backport-Rename-America-Godthab-to-America-Nuuk.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d7715ab774d8ffdf6b745a8758f392617890c676 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 19 Nov 2019 15:16:16 -0800 -Subject: [PATCH 06/35] Rename America/Godthab to America/Nuuk - -* NEWS: Mention this. -* backward (America/Godthab): New backward-compatibility link. -* europe, zone.tab, zone1970.tab (America/Nuuk): -Rename from America/Godthab. ---- - NEWS | 6 ++++++ - backward | 1 + - europe | 7 +++++-- - zone.tab | 2 +- - zone1970.tab | 2 +- - 5 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/NEWS b/NEWS -index af0f06f..c28905b 100644 ---- a/NEWS -+++ b/NEWS -@@ -55,6 +55,12 @@ Release 2019c - 2019-09-11 08:59:48 -0700 - Hong Kong Winter Time, observed from 1941-10-01 to 1941-12-25, - is now flagged as DST and is abbreviated HKWT not HKT. - -+ Changes to timezone identifiers -+ -+ To reflect current usage in English better, America/Godthab has -+ been renamed to America/Nuuk. A backwards-compatibility link -+ remains for the old name. -+ - Changes to code - - leapseconds.awk now relies only on its input data, rather than -diff --git a/backward b/backward -index b4ae3cf..e13ae52 100644 ---- a/backward -+++ b/backward -@@ -17,6 +17,7 @@ Link America/Atikokan America/Coral_Harbour - Link America/Argentina/Cordoba America/Cordoba - Link America/Tijuana America/Ensenada - Link America/Indiana/Indianapolis America/Fort_Wayne -+Link America/Nuuk America/Godthab - Link America/Indiana/Indianapolis America/Indianapolis - Link America/Argentina/Jujuy America/Jujuy - Link America/Indiana/Knox America/Knox_IN -diff --git a/europe b/europe -index 361b396..ea6b103 100644 ---- a/europe -+++ b/europe -@@ -1175,14 +1175,17 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 - -3:00 - -03 1980 Apr 6 2:00 - -3:00 EU -03/-02 1996 - 0:00 - GMT -+# -+# Use the old name Scoresbysund, as the current name Ittoqqortoormiit -+# exceeds tzdb's 14-letter limit and has no common English abbreviation. - Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit - -2:00 - -02 1980 Apr 6 2:00 - -2:00 C-Eur -02/-01 1981 Mar 29 - -1:00 EU -01/+00 --Zone America/Godthab -3:26:56 - LMT 1916 Jul 28 # Nuuk -+Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb - -3:00 - -03 1980 Apr 6 2:00 - -3:00 EU -03/-02 --Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik air base -+Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik - -4:00 Thule A%sT - - # Estonia -diff --git a/zone.tab b/zone.tab -index 408fcb2..55c8ca9 100644 ---- a/zone.tab -+++ b/zone.tab -@@ -189,7 +189,7 @@ GF +0456-05220 America/Cayenne - GG +492717-0023210 Europe/Guernsey - GH +0533-00013 Africa/Accra - GI +3608-00521 Europe/Gibraltar --GL +6411-05144 America/Godthab Greenland (most areas) -+GL +6411-05144 America/Nuuk Greenland (most areas) - GL +7646-01840 America/Danmarkshavn National Park (east coast) - GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit - GL +7634-06847 America/Thule Thule/Pituffik -diff --git a/zone1970.tab b/zone1970.tab -index 822ffa1..f761f3e 100644 ---- a/zone1970.tab -+++ b/zone1970.tab -@@ -173,7 +173,7 @@ GE +4143+04449 Asia/Tbilisi - GF +0456-05220 America/Cayenne - GH +0533-00013 Africa/Accra - GI +3608-00521 Europe/Gibraltar --GL +6411-05144 America/Godthab Greenland (most areas) -+GL +6411-05144 America/Nuuk Greenland (most areas) - GL +7646-01840 America/Danmarkshavn National Park (east coast) - GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit - GL +7634-06847 America/Thule Thule/Pituffik --- -2.19.1 - diff --git a/backport-Yukon-advances-to-year-round-07-from-2020-03-08.patch b/backport-Yukon-advances-to-year-round-07-from-2020-03-08.patch deleted file mode 100644 index 8a19f4840ae8de56dade90021e949304239ee070..0000000000000000000000000000000000000000 --- a/backport-Yukon-advances-to-year-round-07-from-2020-03-08.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e6c1f0e7daa0b6c5131b2976c6be9190845d2b49 Mon Sep 17 00:00:00 2001 -From: Tim Parenti -Date: Thu, 5 Mar 2020 17:47:56 -0500 -Subject: [PATCH 26/35] Yukon advances to year-round -07 from 2020-03-08. - -* northamerica (America/Whitehorse, America/Dawson): Canada's Yukon advances to -year-round -07 on 2020-03-08 and will not fall back on 2020-11-01. -* NEWS: Mention this. ---- - northamerica | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/northamerica b/northamerica -index eba1819..febf05b 100644 ---- a/northamerica -+++ b/northamerica -@@ -2437,6 +2437,18 @@ Zone America/Creston -7:46:04 - LMT 1884 - # obtained in November 2008 should be ignored... - # I apologize for reporting incorrect information in 2008. - -+# From Tim Parenti (2020-03-05): -+# The government of Yukon announced [yesterday] the cessation of seasonal time -+# changes. "After clocks are pushed ahead one hour on March 8, the territory -+# will remain on [UTC-07]. ... [The government] found 93 per cent of -+# respondents wanted to end seasonal time changes and, of that group, 70 per -+# cent wanted 'permanent Pacific Daylight Saving Time.'" -+# https://www.cbc.ca/news/canada/north/yukon-end-daylight-saving-time-1.5486358 -+# -+# Although the government press release prefers PDT, we prefer MST for -+# consistency with nearby Dawson Creek, Creston, and Fort Nelson. -+# https://yukon.ca/en/news/yukon-end-seasonal-time-change -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule NT_YK 1918 only - Apr 14 2:00 1:00 D - Rule NT_YK 1918 only - Oct 27 2:00 0 S -@@ -2491,11 +2503,13 @@ Zone America/Inuvik 0 - -00 1953 # Inuvik founded - Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20 - -9:00 NT_YK Y%sT 1967 May 28 0:00 - -8:00 NT_YK P%sT 1980 -- -8:00 Canada P%sT -+ -8:00 Canada P%sT 2020 Mar 8 2:00 -+ -7:00 - MST - Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 - -9:00 NT_YK Y%sT 1973 Oct 28 0:00 - -8:00 NT_YK P%sT 1980 -- -8:00 Canada P%sT -+ -8:00 Canada P%sT 2020 Mar 8 2:00 -+ -7:00 - MST - - - ############################################################################### --- -2.19.1 - diff --git a/bugfix-0001-add-Beijing-timezone.patch b/bugfix-0001-add-Beijing-timezone.patch index d7a596ca0c42ae6f30ee37e295d8cecaecafa6ff..512fb8640ced6ff6a0ff0a49e76968ae1d7cf820 100644 --- a/bugfix-0001-add-Beijing-timezone.patch +++ b/bugfix-0001-add-Beijing-timezone.patch @@ -21,7 +21,7 @@ index 35774c6..2514bbf 100644 +# Nowadays, China Standard Time is known as "Beijing Time" +Zone Asia/Beijing 8:00 PRC C%sT - # Hong Kong (Xianggang) + # Hong Kong # Milne gives 7:36:41.7; round this. diff --git a/backward b/backward diff --git a/rename-Macau-to-Macao.patch b/rename-Macau-to-Macao.patch index 1c1865b87f429c1e327a9aa39436f22ce81ded6f..1ec09df7d5d14b641b98886c7e7831b65e51d616 100644 --- a/rename-Macau-to-Macao.patch +++ b/rename-Macau-to-Macao.patch @@ -191,11 +191,11 @@ index 85fc001..538c1d1 100644 +++ b/tz-link.html @@ -814,9 +814,9 @@ Chile's official time (in Spanish).
The Hong Kong Observatory maintains a - history of + history of summer time in Hong Kong, -and Macau's Meteorological and Geophysical Bureau maintains a similar + href="https://www.smg.gov.mo/en/subpage/224/page/174">similar -history for Macau. +history for Macao. Unfortunately the latter is incomplete and has errors.
diff --git a/tzcode2019c.tar.gz b/tzcode2019c.tar.gz deleted file mode 100644 index d2fb152188eed3b7cf1a1edb1dc6855b2eea63dd..0000000000000000000000000000000000000000 Binary files a/tzcode2019c.tar.gz and /dev/null differ diff --git a/tzcode2020a.tar.gz b/tzcode2020a.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0a7af3a4c064bd39fcb9f401dd7f0bb3c25a05c3 Binary files /dev/null and b/tzcode2020a.tar.gz differ diff --git a/tzdata.spec b/tzdata.spec index a2ba97a7a37389a2b6c23361dd3ff95df75ac896..a37d8a692896d2657debd441ed0cae7d87b05d61 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,5 +1,5 @@ Name: tzdata -Version: 2019c +Version: 2020a Release: 1 Summary: Timezone data License: Public Domain @@ -7,10 +7,6 @@ URL: https://www.iana.org/time-zones Source0: https://data.iana.org/time-zones/releases/tzdata%{version}.tar.gz Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz -Patch6000: backport-Rename-America-Godthab-to-America-Nuuk.patch -Patch6001: backport-Yukon-advances-to-year-round-07-from-2020-03-08.patch -Patch6002: backport-Morocco-springs-forward-on-05-31-not-05-24.patch - Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch Patch9002: remove-ROC-timezone.patch @@ -38,10 +34,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch6000 -p1 -%patch6001 -p1 -%patch6002 -p1 - %patch9000 -p1 %patch9001 -p1 %patch9002 -p1 @@ -118,6 +110,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Jun 11 2020 liuchao - 2020a-1 +- Type:recommended +- ID:NA +- SUG:NA +- DESC:rebase to tzdata-2020a + * Thu Apr 16 2020 liuchao - 2019c-1 - Type:recommended - ID:NA diff --git a/tzdata2019c.tar.gz b/tzdata2019c.tar.gz deleted file mode 100644 index 2a9c9442a1eed474cdc776fe1d9d87de2c4bdf86..0000000000000000000000000000000000000000 Binary files a/tzdata2019c.tar.gz and /dev/null differ diff --git a/tzdata2020a.tar.gz b/tzdata2020a.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..15b39fb7a2baa4658db9059e2f98385c4f288c0c Binary files /dev/null and b/tzdata2020a.tar.gz differ