!217 Backport patch to fix check error
From: @tjwangxm Reviewed-by: @SuperSix173 Signed-off-by: @SuperSix173
This commit is contained in:
openeuler-ci-bot
Gitee
commit
ed85e55087
47
America-Scoresbysund-matches-America-Nuuk-from-now-o.patch
Normal file
47
America-Scoresbysund-matches-America-Nuuk-from-now-o.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From 0dcebe370ed39ee01ae9c7c9921f1b470a82c756 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 3 Apr 2024 10:25:14 -0700
|
||||
Subject: [PATCH] America/Scoresbysund matches America/Nuuk from now on
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This pacifies ‘make check_now’.
|
||||
* NEWS: Mention this.
|
||||
* zonenow.tab: Remove America/Scoresbysund.
|
||||
---
|
||||
NEWS | 4 +++-
|
||||
zonenow.tab | 2 --
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 6c9c1f5..b345c81 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -6,7 +6,9 @@ Unreleased, experimental changes
|
||||
|
||||
Asia/Almaty has been removed from zonenow.tab as it now agrees
|
||||
with Asia/Tashkent for future timestamps, due to Kazakhstan's
|
||||
- 2024-02-29 time zone change.
|
||||
+ 2024-02-29 time zone change. Similarly, America/Scoresbysund
|
||||
+ has been removed, as it how agrees with America/Nuuk due to
|
||||
+ its 2024-03-31 time zone change.
|
||||
|
||||
|
||||
Release 2024a - 2024-02-01 09:28:56 -0800
|
||||
diff --git a/zonenow.tab b/zonenow.tab
|
||||
index 1e7a86b..84f27e9 100644
|
||||
--- a/zonenow.tab
|
||||
+++ b/zonenow.tab
|
||||
@@ -123,8 +123,6 @@ XX +1455-02331 Atlantic/Cape_Verde Cape Verde
|
||||
#
|
||||
# -01/+00 (EU DST)
|
||||
XX +3744-02540 Atlantic/Azores Azores
|
||||
-# -01/+00 (EU DST) until 2024-03-31; then -02/-01 (EU DST)
|
||||
-XX +7029-02158 America/Scoresbysund Ittoqqortoormiit
|
||||
#
|
||||
# +00 - GMT
|
||||
XX +0519-00402 Africa/Abidjan far western Africa; Iceland ("GMT")
|
||||
--
|
||||
2.43.0
|
||||
|
||||
60
Asia-Almaty-matches-Asia-Tashkent-from-now-on.patch
Normal file
60
Asia-Almaty-matches-Asia-Tashkent-from-now-on.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 59d4a1ba633f020e09765ff272120ac1a21fc028 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 29 Feb 2024 23:20:23 -0800
|
||||
Subject: [PATCH] Asia/Almaty matches Asia/Tashkent from now on
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This pacifies ‘make check_now’.
|
||||
* NEWS: Mention this.
|
||||
* zonenow.tab: Remove Asia/Almaty.
|
||||
---
|
||||
NEWS | 9 +++++++++
|
||||
zonenow.tab | 4 +---
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index f5834c8..6c9c1f5 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,5 +1,14 @@
|
||||
News for the tz database
|
||||
|
||||
+Unreleased, experimental changes
|
||||
+
|
||||
+ Changes to data
|
||||
+
|
||||
+ Asia/Almaty has been removed from zonenow.tab as it now agrees
|
||||
+ with Asia/Tashkent for future timestamps, due to Kazakhstan's
|
||||
+ 2024-02-29 time zone change.
|
||||
+
|
||||
+
|
||||
Release 2024a - 2024-02-01 09:28:56 -0800
|
||||
|
||||
Briefly:
|
||||
diff --git a/zonenow.tab b/zonenow.tab
|
||||
index b6f2910..1e7a86b 100644
|
||||
--- a/zonenow.tab
|
||||
+++ b/zonenow.tab
|
||||
@@ -199,7 +199,7 @@ XX +2518+05518 Asia/Dubai Russia; Caucasus; Persian Gulf; Seychelles; Réunion
|
||||
XX +3431+06912 Asia/Kabul Afghanistan
|
||||
#
|
||||
# +05
|
||||
-XX +4120+06918 Asia/Tashkent Russia; west Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
|
||||
+XX +4120+06918 Asia/Tashkent Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
|
||||
#
|
||||
# +05 - PKT
|
||||
XX +2452+06703 Asia/Karachi Pakistan ("PKT")
|
||||
@@ -215,8 +215,6 @@ XX +2743+08519 Asia/Kathmandu Nepal
|
||||
#
|
||||
# +06
|
||||
XX +2343+09025 Asia/Dhaka Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
|
||||
-# +06 until 2024-03-01; then +05
|
||||
-XX +4315+07657 Asia/Almaty Kazakhstan (except western areas)
|
||||
#
|
||||
# +06:30
|
||||
XX +1647+09610 Asia/Yangon Myanmar; Cocos
|
||||
--
|
||||
2.43.0
|
||||
|
||||
10
tzdata.spec
10
tzdata.spec
@ -1,6 +1,6 @@
|
||||
Name: tzdata
|
||||
Version: 2024a
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Timezone data
|
||||
License: Public Domain
|
||||
URL: https://www.iana.org/time-zones
|
||||
@ -15,6 +15,8 @@ Patch9002: rename-Macau-to-Macao.patch
|
||||
Patch9003: remove-El_Aaiun-timezone.patch
|
||||
Patch9004: remove-Israel-timezone.patch
|
||||
Patch9005: skip-check_web-testcase.patch
|
||||
Patch9006: Asia-Almaty-matches-Asia-Tashkent-from-now-on.patch
|
||||
Patch9007: America-Scoresbysund-matches-America-Nuuk-from-now-o.patch
|
||||
|
||||
BuildRequires: gawk glibc perl-interpreter
|
||||
BuildRequires: java-devel
|
||||
@ -107,6 +109,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
||||
%{_datadir}/javazi-1.8
|
||||
|
||||
%changelog
|
||||
* Wed Apr 10 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 2024a-2
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Backport patch to fix check error
|
||||
|
||||
* Sun Feb 4 2024 liuchao <liuchao173@huawei.com> - 2024a-1
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user