packages/tzdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 升级tzdata到2020a

Browse Source 
Merge pull request !11 from Shinwell_Hu/master
This commit is contained in:
openeuler-ci-bot 2020-06-18 10:21:11 +08:00 committed by Gitee
commit d7242b5912
15 changed files with 52 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
backport-Morocco-springs-forward-on-05-31-not-05-24.patch
View File

@ -1,160 +0,0 @@
From f9aacafa4f15be6e7ff4436164e14d8f08839ac7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

99
backport-Rename-America-Godthab-to-America-Nuuk.patch
View File

@ -1,99 +0,0 @@
From d7715ab774d8ffdf6b745a8758f392617890c676 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

54
backport-Yukon-advances-to-year-round-07-from-2020-03-08.patch
View File

@ -1,54 +0,0 @@
From e6c1f0e7daa0b6c5131b2976c6be9190845d2b49 Mon Sep 17 00:00:00 2001
From: Tim Parenti <tim@timtimeonline.com>
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

32
bugfix-0001-add-Beijing-timezone.patch
View File

@ -1,34 +1,21 @@
From d23da9b32cc3c591a54861eab4d15606ce2fea2c Mon Sep 17 00:00:00 2001
From: <linyanly.lin@huawei.com>
Date: Wed, 21 Jun 2017 16:35:40 +0800
Subject: [PATCH] add Beijing timezone
Signed-off-by: <linyanly.lin@huawei.com>
---
asia | 2 ++
backward | 2 +-
zone.tab | 3 ++-
zone1970.tab | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/asia b/asia
index 35774c6..2514bbf 100644
index 106efad..c631935 100644
--- a/asia
+++ b/asia
@@ -518,6 +518,8 @@ Zone Asia/Urumqi 5:50:20 - LMT 1928
@@ -675,6 +675,8 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
Zone Asia/Urumqi 5:50:20 - LMT 1928
6:00 - +06
+# Nowadays, China Standard Time is known as "Beijing Time"
+Zone Asia/Beijing 8:00 PRC C%sT
# Hong Kong (Xianggang)
# Milne gives 7:36:41.7; round this.
# Hong Kong
diff --git a/backward b/backward
index 09f2a31..4af31d3 100644
index e13ae52..348f99e 100644
--- a/backward
+++ b/backward
@@ -95,7 +95,7 @@ Link America/Mexico_City Mexico/General
@@ -101,7 +101,7 @@ Link America/Mexico_City Mexico/General
Link Pacific/Auckland NZ
Link Pacific/Chatham NZ-CHAT
Link America/Denver Navajo
@ -38,7 +25,7 @@ index 09f2a31..4af31d3 100644
Link Pacific/Pohnpei Pacific/Ponape
Link Pacific/Pago_Pago Pacific/Samoa
diff --git a/zone.tab b/zone.tab
index 204048c..9eea19e 100644
index 8d056e3..cfd90aa 100644
--- a/zone.tab
+++ b/zone.tab
@@ -145,7 +145,8 @@ CL -3327-07040 America/Santiago Chile (most areas)
@ -52,6 +39,7 @@ index 204048c..9eea19e 100644
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
diff --git a/zone1970.tab b/zone1970.tab
index 53ee77e..3d21c92 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -137,7 +137,8 @@ CK -2114-15946 Pacific/Rarotonga
@ -64,5 +52,3 @@ diff --git a/zone1970.tab b/zone1970.tab
CN +4348+08735 Asia/Urumqi Xinjiang Time
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
--
1.8.3.1

32
remove-El_Aaiun-timezone.patch
View File

@ -1,22 +1,8 @@
From 2c270f246664c9990c6e06b13a579db5df34a1f7 Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Thu, 26 Dec 2019 08:00:47 +0000
Subject: [PATCH] tzdata: remove El_Aaiun timezone
Remove El_Aaiun timezone for political sensitivity
---
NEWS | 9 +++------
africa | 16 ----------------
zone.tab | 1 -
zone1970.tab | 1 -
4 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/NEWS b/NEWS
index 0f386df..abbd71a 100644
index a2db876..22458a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1257,9 +1257,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
@@ -1414,9 +1414,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
zic no longer generates binary files containing POSIX TZ-like
strings that disagree with the local time type after the last
explicit transition in the data. This fixes a bug with
@ -29,7 +15,7 @@ index 0f386df..abbd71a 100644
If the installed localtime and/or posixrules files are symbolic
links, zic now keeps them symbolic links when updating them, for
@@ -2614,9 +2614,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
@@ -2771,9 +2771,6 @@ Release 2013h - 2013-10-25 15:32:32 -0700
Libya has switched its UT offset back to +02 without DST, instead
of +01 with DST. (Thanks to Even Scharning.)
@ -40,10 +26,10 @@ index 0f386df..abbd71a 100644
Acre and (we guess) western Amazonas will switch from UT -04 to -05
diff --git a/africa b/africa
index feb6017..64f385a 100644
index 724744f..3dfd0a7 100644
--- a/africa
+++ b/africa
@@ -1090,22 +1090,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
@@ -1096,22 +1096,6 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 Morocco +01/+00
@ -67,7 +53,7 @@ index feb6017..64f385a 100644
#
# Shanks gives 1903-03-01 for the transition to CAT.
diff --git a/zone.tab b/zone.tab
index 3164018..e6e09bc 100644
index 8c28f76..b9def00 100644
--- a/zone.tab
+++ b/zone.tab
@@ -168,7 +168,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@ -79,10 +65,10 @@ index 3164018..e6e09bc 100644
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
diff --git a/zone1970.tab b/zone1970.tab
index 03ec66b..6a27a7f 100644
index 169feda..a572064 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -156,7 +156,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
@@ -157,7 +157,6 @@ EC -0210-07950 America/Guayaquil Ecuador (mainland)
EC -0054-08936 Pacific/Galapagos Galápagos Islands
EE +5925+02445 Europe/Tallinn
EG +3003+03115 Africa/Cairo
@ -90,5 +76,3 @@ index 03ec66b..6a27a7f 100644
ES +4024-00341 Europe/Madrid Spain (mainland)
ES +3553-00519 Africa/Ceuta Ceuta, Melilla
ES +2806-01524 Atlantic/Canary Canary Islands
--
2.19.1

17
remove-Israel-timezone.patch
View File

@ -1,18 +1,8 @@
From 56ce50af655d47852ee35185e89e48d7bf9398f3 Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Fri, 27 Dec 2019 03:26:21 +0000
Subject: [PATCH] tzdata: remove Israel timezone
Remove Israel timezone for political sensitivity
---
backward | 1 -
1 file changed, 1 deletion(-)
diff --git a/backward b/backward
index 7a83706..57e7e87 100644
index 601977d..107738c 100644
--- a/backward
+++ b/backward
@@ -88,7 +88,6 @@ Link Etc/GMT Greenwich
@@ -89,7 +89,6 @@ Link Etc/GMT Greenwich
Link Asia/Hong_Kong Hongkong
Link Atlantic/Reykjavik Iceland
Link Asia/Tehran Iran
@ -20,6 +10,3 @@ index 7a83706..57e7e87 100644
Link America/Jamaica Jamaica
Link Asia/Tokyo Japan
Link Pacific/Kwajalein Kwajalein
--
2.19.1

17
remove-ROC-timezone.patch
View File

@ -1,18 +1,8 @@
From e8f92212b847873fa367ed1f65629b01b72f0c5d Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Thu, 28 Nov 2019 16:46:39 +0800
Subject: [PATCH] tzdata: remove ROC timezone
remove ROC timezone in backward
---
backward | 1 -
1 files changed, 1 deletions(-)
diff --git a/backward b/backward
index b745dc4..0791742 100644
index 348f99e..d13e811 100644
--- a/backward
+++ b/backward
@@ -108,7 +108,6 @@ Link Pacific/Chuuk Pacific/Truk
@@ -109,7 +109,6 @@ Link Pacific/Chuuk Pacific/Truk
Link Pacific/Chuuk Pacific/Yap
Link Europe/Warsaw Poland
Link Europe/Lisbon Portugal
@ -20,6 +10,3 @@ index b745dc4..0791742 100644
Link Asia/Seoul ROK
Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey
--
2.19.1

15
remove-country-selection-from-tzselect-steps.patch
View File

@ -1,15 +1,5 @@
From 5832b4af2d049beec76ecd4513d5333d4a76cd91 Mon Sep 17 00:00:00 2001
From: hejingxian <hejingxian@huawei.com>
Date: Tue, 4 Sep 2019 15:19:46 +0800
Subject: [PATCH] Remove country select operation from tzselect steps.
For political reasons, avoid selecting country in tzselect.
---
tzselect.ksh | 90 +++++++++++-------------------------------------------------
1 file changed, 16 insertions(+), 74 deletions(-)
diff --git a/tzselect.ksh b/tzselect.ksh
index 18fce27..65fef55 100644
index 18fce27..7784f2e 100644
--- a/tzselect.ksh
+++ b/tzselect.ksh
@@ -51,7 +51,7 @@ say() {
@ -131,6 +121,3 @@ index 18fce27..65fef55 100644
esac
# Make sure the corresponding zoneinfo file exists.
--
1.8.3.1

56
rename-Macau-to-Macao.patch
View File

@ -1,25 +1,8 @@
From e665205e9b11d10e6805b0c4e9c58f726ecd9ccd Mon Sep 17 00:00:00 2001
From: liuchao <liuchao173@huawei.com>
Date: Wed, 4 Dec 2019 10:56:22 +0800
Subject: [PATCH] rename Macau to Macao
Aomen should be spelled in English as Macao
---
NEWS | 10 ++++----
asia | 70 ++++++++++++++++++++++++++--------------------------
backward | 1 -
iso3166.tab | 2 +-
tz-link.html | 4 +--
zishrink.awk | 2 +-
zone.tab | 2 +-
zone1970.tab | 2 +-
8 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/NEWS b/NEWS
index 8b05f8f..0f386df 100644
index 321e090..a2db876 100644
--- a/NEWS
+++ b/NEWS
@@ -297,9 +297,9 @@ Release 2018f - 2018-10-18 00:14:18 -0700
@@ -454,9 +454,9 @@ Release 2018f - 2018-10-18 00:14:18 -0700
April 10. Its DST transitions in 1986/91 were at 02:00, not 00:00.
(Thanks to P Chan.)
@ -32,7 +15,7 @@ index 8b05f8f..0f386df 100644
observed DST in 1942/79, not 1961/80, and there were several
errors for transition times and dates. (Thanks to P Chan.)
@@ -504,7 +504,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
@@ -661,7 +661,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
This transition was at 00:00 according to the new UT offset, not
according to the old one. Also assume that Cape Verde switched on
the same date as the rest, not in 1907. This affects
@ -41,7 +24,7 @@ index 8b05f8f..0f386df 100644
Atlantic/Cape_Verde, Atlantic/Madeira, and Europe/Lisbon.
(Thanks to Michael Deckers.)
@@ -994,7 +994,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
@@ -1151,7 +1151,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
(Atlantic Standard Time had not been standardized yet). Use "AWT"
and "APT" instead of the invented abbreviations "CAWT" and "CAPT".
@ -51,10 +34,10 @@ index 8b05f8f..0f386df 100644
invented abbreviation "JCST" for Japan and Korea before 1938.
diff --git a/asia b/asia
index 348e2b5..7579a13 100644
index c631935..225ffb1 100644
--- a/asia
+++ b/asia
@@ -886,12 +886,12 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -999,12 +999,12 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
9:00 - JST 1945 Sep 21 1:00
8:00 Taiwan C%sT
@ -69,7 +52,7 @@ index 348e2b5..7579a13 100644
# Chinese and Portuguese. The term "HORÁRIO DE VERÃO" can be used for
# searching decrees about summer time.
# * Archives of Macao
@@ -900,13 +900,13 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -1013,13 +1013,13 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
# * The Macao Meteorological and Geophysical Bureau have a page listing the
# summer time history. But it is not complete and has some mistakes.
# http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
@ -85,7 +68,7 @@ index 348e2b5..7579a13 100644
#
# From LegisMac, here is a list of decrees that changed the time ...
# [Decree Gazette-no. date; titles omitted in this quotation]
@@ -985,43 +985,43 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
@@ -1098,43 +1098,43 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
# between GMT+9 and GMT+10. Also in 1965 and 1965 the DST ended at 2:30am.
# From Paul Eggert (2018-05-10):
@ -161,10 +144,10 @@ index 348e2b5..7579a13 100644
###############################################################################
diff --git a/backward b/backward
index b4ae3cf..71a79e2 100644
index d13e811..601977d 100644
--- a/backward
+++ b/backward
@@ -37,7 +37,6 @@ Link Asia/Dhaka Asia/Dacca
@@ -38,7 +38,6 @@ Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu
@ -186,16 +169,16 @@ index a4ff61a..1c53cc0 100644
MQ Martinique
MR Mauritania
diff --git a/tz-link.html b/tz-link.html
index 85fc001..538c1d1 100644
index 1f893f6..7c5cb0a 100644
--- a/tz-link.html
+++ b/tz-link.html
@@ -814,9 +814,9 @@ Chile's official time (in Spanish)</a>.</dd>
@@ -831,9 +831,9 @@ Chile's official time (in Spanish)</a>.</dd>
<dd>The Hong Kong Observatory maintains a
<a href="https://www.hko.gov.hk/gts/time/Summertime.htm">history of
<a href="https://www.hko.gov.hk/en/gts/time/Summertime.htm">history of
summer time in Hong Kong</a>,
-and Macau's Meteorological and Geophysical Bureau maintains a <a
+and Macao's Meteorological and Geophysical Bureau maintains a <a
href="http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm">similar
href="https://www.smg.gov.mo/en/subpage/224/page/174">similar
-history for Macau</a>.
+history for Macao</a>.
Unfortunately the latter is incomplete and has errors.</dd>
@ -215,10 +198,10 @@ index 4e187ac..a41382c 100644
# Use ISO 3166 alpha-2 country codes for remaining names that are countries.
# This is more systematic, and avoids collisions (e.g., Malta and Moldova).
diff --git a/zone.tab b/zone.tab
index 408fcb2..ee58572 100644
index cfd90aa..8c28f76 100644
--- a/zone.tab
+++ b/zone.tab
@@ -269,7 +269,7 @@ MM +1647+09610 Asia/Yangon
@@ -270,7 +270,7 @@ MM +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
@ -228,10 +211,10 @@ index 408fcb2..ee58572 100644
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
diff --git a/zone1970.tab b/zone1970.tab
index 822ffa1..03ec66b 100644
index 3d21c92..169feda 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -232,7 +232,7 @@ MM +1647+09610 Asia/Yangon
@@ -233,7 +233,7 @@ MM +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar
@ -240,6 +223,3 @@ index 822ffa1..03ec66b 100644
MQ +1436-06105 America/Martinique
MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
--
2.19.1

BIN
tzcode2019c.tar.gz
View File

Binary file not shown.

BIN
tzcode2020a.tar.gz Normal file
View File

Binary file not shown.

21
tzdata.spec
View File

@ -1,15 +1,13 @@
Name: tzdata
Version: 2019c
Version: 2020a
Release: 1
Summary: Timezone data
License: Public Domain
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
Source2: javazic.tar.gz
Source3: javazic-1.8-37392f2f5d59.tar.xz
Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-country-selection-from-tzselect-steps.patch
@ -29,8 +27,6 @@ the world.
%package java
Summary: Timezone data for Java
Source3: javazic.tar.gz
Source4: javazic-1.8-37392f2f5d59.tar.xz
%description java
This package contains timezone information for use by Java runtimes.
@ -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
@ -54,7 +46,7 @@ tar zxf tzdata%{version}-rearguard.tar.gz
rm tzdata.zi
mkdir javazic
tar zxf %{SOURCE3} -C javazic
tar zxf %{SOURCE2} -C javazic
cd javazic
mv sun rht
@ -63,7 +55,7 @@ find . -type f -name '*.java' -print0 \
-e 's:sun\.util\.:rht.util.:g'
cd ..
tar xf %{SOURCE4}
tar xf %{SOURCE3}
echo "%{name}%{version}" >> VERSION
@ -118,6 +110,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8
%changelog
* Wed Jun 17 2020 Shinwell Hu <huxinwei@huawei.com> - 2020a - 1
- Upgrade to 2020a
* Thu Apr 16 2020 liuchao<liuchao173@huawei.com> - 2019c-1
- Type:recommended
- ID:NA

4
tzdata.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: eggert/tz
tag_prefix: ""
seperator: "."

BIN
tzdata2019c.tar.gz
View File

Binary file not shown.

BIN
tzdata2020a.tar.gz Normal file
View File

Binary file not shown.