diff --git a/backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch b/backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch deleted file mode 100644 index d6cb562..0000000 --- a/backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 95a16c87f21c4643055482429dad921357a630c9 Mon Sep 17 00:00:00 2001 -From: Tim Parenti -Date: Fri, 19 Jan 2024 14:13:23 -0500 -Subject: [PATCH] Kazakhstan unifies on UTC+5 beginning 2024-03-01. - -* NEWS: Mention this. -* asia (Asia/Almaty, Asia/Qostanay): Switch from UTC+6 to UTC+5 -beginning 2024-03-01 00:00. - -Conflicts: remove the NEWS part ---- - asia | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/asia b/asia -index 8028c06e..20ff92b4 100644 ---- a/asia -+++ b/asia -@@ -2457,6 +2457,16 @@ Zone Asia/Amman 2:23:44 - LMT 1931 - # effective December 21st, 2018.... - # http://adilet.zan.kz/rus/docs/P1800000817 (russian language). - -+# From Zhanbolat Raimbekov (2024-01-19): -+# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024 -+# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru -+# [in Russian] -+# -+# From Alexander Krivenyshev (2024-01-19): -+# According to a different news and the official web site for the Ministry of -+# Trade and Integration of the Republic of Kazakhstan: -+# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/ -+ - # Zone NAME STDOFF RULES FORMAT [UNTIL] - # - # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan -@@ -2467,7 +2477,8 @@ Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata - 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s - 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s - 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s -- 6:00 - +06 -+ 6:00 - +06 2024 Mar 1 0:00 -+ 5:00 - +05 - # Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) - Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 -@@ -2481,7 +2492,6 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s - 6:00 - +06 2018 Dec 21 0:00 - 5:00 - +05 --# - # Qostanay (aka Kostanay, Kustanay) (KZ-KUS) - # The 1991/2 rules are unclear partly because of the 1997 Turgai - # reorganization. -@@ -2493,8 +2503,8 @@ Zone Asia/Qostanay 4:14:28 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s - 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s -- 6:00 - +06 -- -+ 6:00 - +06 2024 Mar 1 0:00 -+ 5:00 - +05 - # Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) - Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 - +04 1930 Jun 21 --- -2.23.0 - diff --git a/backport-Palestine-springs-forward-a-week-later-after-Ramadan.patch b/backport-Palestine-springs-forward-a-week-later-after-Ramadan.patch deleted file mode 100644 index caa8e35..0000000 --- a/backport-Palestine-springs-forward-a-week-later-after-Ramadan.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 23e7cfa05f27a911e77f9b6bd092610750d1ec0d Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 25 Jan 2024 12:28:16 -0800 -Subject: [PATCH] Palestine springs forward a week later after Ramadan -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Palestine’s cabinet announced changes for 2024 and 2025 -(thanks to Heba Hamad). -* NEWS: Mention this. -* asia (Palestine): Adjust 2024 and 2025 to match government -announcement. Guess the second Saturday after Ramadan for later -transitions. - -Conflicts: remove the NEWS part ---- - asia | 92 +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 50 insertions(+), 42 deletions(-) - -diff --git a/asia b/asia -index 1a6fa4f8..05683b9e 100644 ---- a/asia -+++ b/asia -@@ -3444,19 +3444,26 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # ... winter time will begin in Palestine from Saturday 10-28-2023, - # 02:00 AM by 60 minutes back. - # --# From Paul Eggert (2023-03-22): -+# From Heba Hamad (2024-01-25): -+# the summer time for the years 2024,2025 will begin in Palestine -+# from Saturday at 02:00 AM by 60 minutes forward as shown below: -+# year date -+# 2024 2024-04-20 -+# 2025 2025-04-12 -+# -+# From Paul Eggert (2024-01-25): - # For now, guess that spring and fall transitions will normally - # continue to use 2022's rules, that during DST Palestine will switch - # to standard time at 02:00 the last Saturday before Ramadan and back --# to DST at 02:00 the first Saturday after Ramadan, and that -+# to DST at 02:00 the second Saturday after Ramadan, and that - # if the normal spring-forward or fall-back transition occurs during - # Ramadan the former is delayed and the latter advanced. - # To implement this, I predicted Ramadan-oriented transition dates for --# 2023 through 2086 by running the following program under GNU Emacs 28.2, -+# 2026 through 2086 by running the following program under GNU Emacs 29.2, - # with the results integrated by hand into the table below. - # Predictions after 2086 are approximated without Ramadan. - # --# (let ((islamic-year 1444)) -+# (let ((islamic-year 1447)) - # (require 'cal-islam) - # (while (< islamic-year 1510) - # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -@@ -3465,6 +3472,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # (while (/= saturday (mod (setq a (1- a)) 7))) - # (while (/= saturday (mod b 7)) - # (setq b (1+ b))) -+# (setq b (+ 7 b)) - # (setq a (calendar-gregorian-from-absolute a)) - # (setq b (calendar-gregorian-from-absolute b)) - # (insert -@@ -3515,84 +3523,84 @@ Rule Palestine 2021 only - Oct 29 1:00 0 - - Rule Palestine 2022 only - Mar 27 0:00 1:00 S - Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - - Rule Palestine 2023 only - Apr 29 2:00 1:00 S --Rule Palestine 2024 only - Apr 13 2:00 1:00 S --Rule Palestine 2025 only - Apr 5 2:00 1:00 S -+Rule Palestine 2024 only - Apr 20 2:00 1:00 S -+Rule Palestine 2025 only - Apr 12 2:00 1:00 S - Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2036 only - Oct 18 2:00 0 - - Rule Palestine 2037 only - Oct 10 2:00 0 - - Rule Palestine 2038 only - Sep 25 2:00 0 - - Rule Palestine 2039 only - Sep 17 2:00 0 - --Rule Palestine 2039 only - Oct 22 2:00 1:00 S --Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - - Rule Palestine 2040 only - Sep 1 2:00 0 - --Rule Palestine 2040 only - Oct 13 2:00 1:00 S -+Rule Palestine 2040 only - Oct 20 2:00 1:00 S -+Rule Palestine 2040 2067 - Oct Sat<=30 2:00 0 - - Rule Palestine 2041 only - Aug 24 2:00 0 - --Rule Palestine 2041 only - Sep 28 2:00 1:00 S -+Rule Palestine 2041 only - Oct 5 2:00 1:00 S - Rule Palestine 2042 only - Aug 16 2:00 0 - --Rule Palestine 2042 only - Sep 20 2:00 1:00 S -+Rule Palestine 2042 only - Sep 27 2:00 1:00 S - Rule Palestine 2043 only - Aug 1 2:00 0 - --Rule Palestine 2043 only - Sep 12 2:00 1:00 S -+Rule Palestine 2043 only - Sep 19 2:00 1:00 S - Rule Palestine 2044 only - Jul 23 2:00 0 - --Rule Palestine 2044 only - Aug 27 2:00 1:00 S -+Rule Palestine 2044 only - Sep 3 2:00 1:00 S - Rule Palestine 2045 only - Jul 15 2:00 0 - --Rule Palestine 2045 only - Aug 19 2:00 1:00 S -+Rule Palestine 2045 only - Aug 26 2:00 1:00 S - Rule Palestine 2046 only - Jun 30 2:00 0 - --Rule Palestine 2046 only - Aug 11 2:00 1:00 S -+Rule Palestine 2046 only - Aug 18 2:00 1:00 S - Rule Palestine 2047 only - Jun 22 2:00 0 - --Rule Palestine 2047 only - Jul 27 2:00 1:00 S -+Rule Palestine 2047 only - Aug 3 2:00 1:00 S - Rule Palestine 2048 only - Jun 6 2:00 0 - --Rule Palestine 2048 only - Jul 18 2:00 1:00 S -+Rule Palestine 2048 only - Jul 25 2:00 1:00 S - Rule Palestine 2049 only - May 29 2:00 0 - --Rule Palestine 2049 only - Jul 3 2:00 1:00 S -+Rule Palestine 2049 only - Jul 10 2:00 1:00 S - Rule Palestine 2050 only - May 21 2:00 0 - --Rule Palestine 2050 only - Jun 25 2:00 1:00 S -+Rule Palestine 2050 only - Jul 2 2:00 1:00 S - Rule Palestine 2051 only - May 6 2:00 0 - --Rule Palestine 2051 only - Jun 17 2:00 1:00 S -+Rule Palestine 2051 only - Jun 24 2:00 1:00 S - Rule Palestine 2052 only - Apr 27 2:00 0 - --Rule Palestine 2052 only - Jun 1 2:00 1:00 S -+Rule Palestine 2052 only - Jun 8 2:00 1:00 S - Rule Palestine 2053 only - Apr 12 2:00 0 - --Rule Palestine 2053 only - May 24 2:00 1:00 S -+Rule Palestine 2053 only - May 31 2:00 1:00 S - Rule Palestine 2054 only - Apr 4 2:00 0 - --Rule Palestine 2054 only - May 16 2:00 1:00 S --Rule Palestine 2055 only - May 1 2:00 1:00 S --Rule Palestine 2056 only - Apr 22 2:00 1:00 S --Rule Palestine 2057 only - Apr 7 2:00 1:00 S --Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S -+Rule Palestine 2054 only - May 23 2:00 1:00 S -+Rule Palestine 2055 only - May 8 2:00 1:00 S -+Rule Palestine 2056 only - Apr 29 2:00 1:00 S -+Rule Palestine 2057 only - Apr 14 2:00 1:00 S -+Rule Palestine 2058 only - Apr 6 2:00 1:00 S -+Rule Palestine 2059 max - Mar Sat<=30 2:00 1:00 S - Rule Palestine 2068 only - Oct 20 2:00 0 - - Rule Palestine 2069 only - Oct 12 2:00 0 - - 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 only - Oct 22 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 2073 only - Oct 14 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 2074 only - Oct 6 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 only - Sep 21 2:00 1:00 S - Rule Palestine 2076 only - Jul 25 2:00 0 - --Rule Palestine 2076 only - Sep 5 2:00 1:00 S -+Rule Palestine 2076 only - Sep 12 2:00 1:00 S - Rule Palestine 2077 only - Jul 17 2:00 0 - --Rule Palestine 2077 only - Aug 28 2:00 1:00 S -+Rule Palestine 2077 only - Sep 4 2:00 1:00 S - Rule Palestine 2078 only - Jul 9 2:00 0 - --Rule Palestine 2078 only - Aug 13 2:00 1:00 S -+Rule Palestine 2078 only - Aug 20 2:00 1:00 S - Rule Palestine 2079 only - Jun 24 2:00 0 - --Rule Palestine 2079 only - Aug 5 2:00 1:00 S -+Rule Palestine 2079 only - Aug 12 2:00 1:00 S - Rule Palestine 2080 only - Jun 15 2:00 0 - --Rule Palestine 2080 only - Jul 20 2:00 1:00 S -+Rule Palestine 2080 only - Jul 27 2:00 1:00 S - Rule Palestine 2081 only - Jun 7 2:00 0 - --Rule Palestine 2081 only - Jul 12 2:00 1:00 S -+Rule Palestine 2081 only - Jul 19 2:00 1:00 S - Rule Palestine 2082 only - May 23 2:00 0 - --Rule Palestine 2082 only - Jul 4 2:00 1:00 S -+Rule Palestine 2082 only - Jul 11 2:00 1:00 S - Rule Palestine 2083 only - May 15 2:00 0 - --Rule Palestine 2083 only - Jun 19 2:00 1:00 S -+Rule Palestine 2083 only - Jun 26 2:00 1:00 S - Rule Palestine 2084 only - Apr 29 2:00 0 - --Rule Palestine 2084 only - Jun 10 2:00 1:00 S -+Rule Palestine 2084 only - Jun 17 2:00 1:00 S - Rule Palestine 2085 only - Apr 21 2:00 0 - --Rule Palestine 2085 only - Jun 2 2:00 1:00 S -+Rule Palestine 2085 only - Jun 9 2:00 1:00 S - Rule Palestine 2086 only - Apr 13 2:00 0 - --Rule Palestine 2086 only - May 18 2:00 1:00 S -+Rule Palestine 2086 only - May 25 2:00 1:00 S - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct --- -2.33.0 - diff --git a/tzcode2023d.tar.gz b/tzcode2023d.tar.gz deleted file mode 100644 index 0325c5d..0000000 Binary files a/tzcode2023d.tar.gz and /dev/null differ diff --git a/tzcode2024a.tar.gz b/tzcode2024a.tar.gz new file mode 100644 index 0000000..042fde2 Binary files /dev/null and b/tzcode2024a.tar.gz differ diff --git a/tzdata.spec b/tzdata.spec index 42dbd3c..ae37658 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata -Version: 2023d -Release: 2 +Version: 2024a +Release: 1 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -9,9 +9,6 @@ Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz Source2: javazic.tar.gz Source3: javazic-1.8-37392f2f5d59.tar.xz -Patch6000: backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch -Patch6001: backport-Palestine-springs-forward-a-week-later-after-Ramadan.patch - Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-ROC-timezone.patch Patch9002: rename-Macau-to-Macao.patch @@ -110,6 +107,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Feb 4 2024 liuchao - 2024a-1 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: upgrade tzdata to 2024a + * Sun Feb 4 2024 liuchao - 2023d-2 - Type:bugfix - CVE:NA diff --git a/tzdata2023d.tar.gz b/tzdata2023d.tar.gz deleted file mode 100644 index 1d3df37..0000000 Binary files a/tzdata2023d.tar.gz and /dev/null differ diff --git a/tzdata2024a.tar.gz b/tzdata2024a.tar.gz new file mode 100644 index 0000000..febf30b Binary files /dev/null and b/tzdata2024a.tar.gz differ