Fix Palestine predictions for 2072 through 2075; Ittoqqortoormiit (America/Scoresbysund) zone change.
Signed-off-by: langfei <langfei@huawei.com>
This commit is contained in:
langfei
parent
b271ae54c6
commit
a9ba5eead9
@ -0,0 +1,38 @@
|
||||
From 169db122f7398e6c71add507cf4af5336ab71bfe Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 15 Oct 2023 20:37:07 -0700
|
||||
Subject: [PATCH] Fix Palestine predictions for 2072 through 2075
|
||||
|
||||
Reference: https://github.com/601376534/tz/commit/169db122f7398e6c71add507cf4af5336ab71bfe
|
||||
Conflict: remove NEWS
|
||||
|
||||
* asia (Palestine): Move restoration of fall-back transition from
|
||||
2075 back to 2072. This adds normal fall-back and spring-forward
|
||||
transitions for 2072-10-29, 2073-03-25, 2073-10-28, 2074-03-24,
|
||||
2074-10-27, 2075-03-30 that were mistakenly omitted in release 2023a.
|
||||
---
|
||||
asia | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/asia b/asia
|
||||
index 8df2f258..36d7b445 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -3551,13 +3551,13 @@ Rule Palestine 2070 only - Oct 4 2:00 0 -
|
||||
Rule Palestine 2071 only - Sep 19 2:00 0 -
|
||||
Rule Palestine 2072 only - Sep 10 2:00 0 -
|
||||
Rule Palestine 2072 only - Oct 15 2:00 1:00 S
|
||||
+Rule Palestine 2072 max - Oct Sat<=30 2:00 0 -
|
||||
Rule Palestine 2073 only - Sep 2 2:00 0 -
|
||||
Rule Palestine 2073 only - Oct 7 2:00 1:00 S
|
||||
Rule Palestine 2074 only - Aug 18 2:00 0 -
|
||||
Rule Palestine 2074 only - Sep 29 2:00 1:00 S
|
||||
Rule Palestine 2075 only - Aug 10 2:00 0 -
|
||||
Rule Palestine 2075 only - Sep 14 2:00 1:00 S
|
||||
-Rule Palestine 2075 max - Oct Sat<=30 2:00 0 -
|
||||
Rule Palestine 2076 only - Jul 25 2:00 0 -
|
||||
Rule Palestine 2076 only - Sep 5 2:00 1:00 S
|
||||
Rule Palestine 2077 only - Jul 17 2:00 0 -
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
From 0f79a07202ab13e6c8069a34912be50518e04440 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 29 Oct 2023 12:52:14 -0700
|
||||
Subject: [PATCH] Ittoqqortoormiit (America/Scoresbysund) zone change
|
||||
|
||||
Reference: https://github.com/601376534/tz/commit/0f79a07202ab13e6c8069a34912be50518e04440
|
||||
Conflict: remove NEWS
|
||||
|
||||
* NEWS: Mention this.
|
||||
* europe (America/Scoresbysund): Switch to -02/-01 on 2024-03-31.
|
||||
---
|
||||
europe | 14 +++++++++++++-
|
||||
1 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 012d1498..6e59f62d 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1130,6 +1130,17 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
||||
# However, Greenland will change to Daylight Saving Time again in 2024
|
||||
# and onwards.
|
||||
|
||||
+# From an contributor who wishes to remain anonymous for now (2023-10-29):
|
||||
+# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland
|
||||
+# with a link to that page:
|
||||
+# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid
|
||||
+# ... Ittoqqortoormiit joins the time of Nuuk at March 2024.
|
||||
+# What would mean that America/Scoresbysund would either be in -01 year round
|
||||
+# or in -02/-01 like America/Nuuk, but no longer in -01/+00.
|
||||
+#
|
||||
+# From Paul Eggert (2023-10-29):
|
||||
+# For now, assume it will be like America/Nuuk.
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
|
||||
Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
|
||||
@@ -1149,7 +1160,8 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
|
||||
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
|
||||
+ -1:00 EU -01/+00 2024 Mar 31
|
||||
+ -2:00 EU -02/-01
|
||||
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 2023 Mar 26 1:00u
|
||||
--
|
||||
2.39.1
|
||||
|
||||
10
tzdata.spec
10
tzdata.spec
@ -1,6 +1,6 @@
|
||||
Name: tzdata
|
||||
Version: 2022g
|
||||
Release: 5
|
||||
Release: 6
|
||||
Summary: Timezone data
|
||||
License: Public Domain
|
||||
URL: https://www.iana.org/time-zones
|
||||
@ -15,6 +15,8 @@ Patch6002: backport-Max-max.patch
|
||||
Patch6003: backport-This-year-Morocco-springs-forward-April-23-not-April.patch
|
||||
Patch6004: backport-Palestine-no-longer-observes-DST-during-Ramadan.patch
|
||||
Patch6005: backport-Greenland-changed-standard-time-already.patch
|
||||
Patch6006: backport-Fix-Palestine-predictions-for-2072-through-2075.patch
|
||||
Patch6007: backport-Ittoqqortoormiit-America-Scoresbysund-zone-change.patch
|
||||
|
||||
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
||||
Patch9001: remove-ROC-timezone.patch
|
||||
@ -114,6 +116,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
||||
%{_datadir}/javazi-1.8
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 langfei<langfei@huawei.com> - 2022g-6
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Fix Palestine predictions for 2072 through 2075; Ittoqqortoormiit (America/Scoresbysund) zone change.
|
||||
|
||||
* Thu Apr 6 2023 qinyu<qinyu32@huawei.com> - 2022g-5
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user