!94 update to 2021b
From: @SuperSix173 Reviewed-by: @wangbin224 Signed-off-by: @wangbin224
This commit is contained in:
openeuler-ci-bot
Gitee
commit
0b748a8a65
@ -1,39 +0,0 @@
|
||||
From 29583c461a9705118560e02e69bb64a0bf2fce0c Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 20 Sep 2021 00:23:09 -0700
|
||||
Subject: [PATCH] Samoa no longer observes DST
|
||||
|
||||
(Thanks to Geoffrey D. Bennett.)
|
||||
* NEWS: Mention this.
|
||||
* australasia: Last DST transition was April.
|
||||
---
|
||||
australasia | 8 ++++++--
|
||||
1 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/australasia b/australasia
|
||||
index c68a445..6fe681b 100644
|
||||
--- a/australasia
|
||||
+++ b/australasia
|
||||
@@ -753,13 +753,17 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
|
||||
# From Paul Eggert (2014-07-08):
|
||||
# That web page currently lists transitions for 2012/3 and 2013/4.
|
||||
# Assume the pattern instituted in 2012 will continue indefinitely.
|
||||
+#
|
||||
+# From Geoffrey D. Bennett (2021-09-20):
|
||||
+# https://www.mcil.gov.ws/storage/2021/09/MCIL-Scan_20210920_120553.pdf
|
||||
+# DST has been cancelled for this year.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule WS 2010 only - Sep lastSun 0:00 1 -
|
||||
Rule WS 2011 only - Apr Sat>=1 4:00 0 -
|
||||
Rule WS 2011 only - Sep lastSat 3:00 1 -
|
||||
-Rule WS 2012 max - Apr Sun>=1 4:00 0 -
|
||||
-Rule WS 2012 max - Sep lastSun 3:00 1 -
|
||||
+Rule WS 2012 2021 - Apr Sun>=1 4:00 0 -
|
||||
+Rule WS 2012 2020 - Sep lastSun 3:00 1 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
|
||||
-11:26:56 - LMT 1911
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,44 +1,31 @@
|
||||
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
|
||||
|
||||
# Milne gives 7:36:41.7; round this.
|
||||
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
|
||||
-Link Asia/Shanghai PRC
|
||||
+Link Asia/Beijing PRC
|
||||
Link Pacific/Kanton Pacific/Enderbury
|
||||
Link Pacific/Honolulu Pacific/Johnston
|
||||
Link Pacific/Pohnpei Pacific/Ponape
|
||||
Link Pacific/Pago_Pago Pacific/Samoa
|
||||
Link Pacific/Pago_Pago Pacific/Midway
|
||||
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
|
||||
|
||||
@ -1,25 +1,12 @@
|
||||
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
|
||||
Link Asia/Hong_Kong Hongkong
|
||||
Link Atlantic/Reykjavik Iceland
|
||||
@@ -89,7 +89,6 @@ Link Africa/Nairobi Indian/Antananarivo
|
||||
Link Africa/Nairobi Indian/Comoro
|
||||
Link Africa/Nairobi Indian/Mayotte
|
||||
Link Asia/Tehran Iran
|
||||
-Link Asia/Jerusalem Israel
|
||||
Link America/Jamaica Jamaica
|
||||
Link Asia/Tokyo Japan
|
||||
Link Pacific/Kwajalein Kwajalein
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
@ -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,17 +144,17 @@ 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
|
||||
Link Asia/Shanghai Asia/Harbin
|
||||
@@ -38,7 +38,6 @@ Link Europe/Istanbul Asia/Istanbul
|
||||
Link Asia/Urumqi Asia/Kashgar
|
||||
Link Asia/Kathmandu Asia/Katmandu
|
||||
Link Asia/Riyadh Asia/Kuwait
|
||||
-Link Asia/Macau Asia/Macao
|
||||
Link Asia/Dubai Asia/Muscat
|
||||
Link Asia/Bangkok Asia/Phnom_Penh
|
||||
Link Asia/Yangon Asia/Rangoon
|
||||
Link Asia/Ho_Chi_Minh Asia/Saigon
|
||||
Link Asia/Jerusalem Asia/Tel_Aviv
|
||||
diff --git a/iso3166.tab b/iso3166.tab
|
||||
index a4ff61a..1c53cc0 100644
|
||||
--- a/iso3166.tab
|
||||
@ -186,10 +169,10 @@ 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/en/gts/time/Summertime.htm">history of
|
||||
summer time in Hong Kong</a>,
|
||||
@ -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
|
||||
|
||||
|
||||
Binary file not shown.
BIN
tzcode2021b.tar.gz
Normal file
BIN
tzcode2021b.tar.gz
Normal file
Binary file not shown.
12
tzdata.spec
12
tzdata.spec
@ -1,14 +1,12 @@
|
||||
Name: tzdata
|
||||
Version: 2021a
|
||||
Release: 4
|
||||
Version: 2021b
|
||||
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: Samoa-no-longer-observes-DST.patch
|
||||
|
||||
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
||||
Patch9001: remove-country-selection-from-tzselect-steps.patch
|
||||
Patch9002: remove-ROC-timezone.patch
|
||||
@ -109,6 +107,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
||||
%{_datadir}/javazi-1.8
|
||||
|
||||
%changelog
|
||||
* Sun Sep 26 2021 liuchao<liuchao173@huawei.com> - 2021b-1
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 2021b
|
||||
|
||||
* Thu Sep 23 2021 liuchao<liuchao173@huawei.com> - 2021a-4
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Binary file not shown.
BIN
tzdata2021b.tar.gz
Normal file
BIN
tzdata2021b.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user