!79 Samoa no longer observes DST

From: @SuperSix173
Reviewed-by: @wangbin224
Signed-off-by: @wangbin224
This commit is contained in:
openeuler-ci-bot 2021-09-23 08:47:52 +00:00 committed by Gitee
commit 1aaf3708b8
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,39 @@
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

View File

@ -1,6 +1,6 @@
Name: tzdata Name: tzdata
Version: 2021a Version: 2021a
Release: 3 Release: 4
Summary: Timezone data Summary: Timezone data
License: Public Domain License: Public Domain
URL: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
@ -9,6 +9,8 @@ Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
Source2: javazic.tar.gz Source2: javazic.tar.gz
Source3: javazic-1.8-37392f2f5d59.tar.xz Source3: javazic-1.8-37392f2f5d59.tar.xz
Patch6000: Samoa-no-longer-observes-DST.patch
Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch
Patch9001: remove-country-selection-from-tzselect-steps.patch Patch9001: remove-country-selection-from-tzselect-steps.patch
Patch9002: remove-ROC-timezone.patch Patch9002: remove-ROC-timezone.patch
@ -107,6 +109,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8 %{_datadir}/javazi-1.8
%changelog %changelog
* Thu Sep 23 2021 liuchao<liuchao173@huawei.com> - 2021a-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Samoa no longer observes DST
* Tue Aug 17 2021 liuchao<liuchao173@huawei.com> - 2021a-3 * Tue Aug 17 2021 liuchao<liuchao173@huawei.com> - 2021a-3
- add factory timezone and enbale make check - add factory timezone and enbale make check