Compare commits

...

No commits in common. 'c9' and 'i9' have entirely different histories.
c9 ... i9

@ -0,0 +1,43 @@
From 1397d227e38f92c109b74a5b340ea4dfe9cc9d37 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Mon, 3 Apr 2023 22:53:51 +0300
Subject: [PATCH] Fix Simferopol country
---
zone.tab | 5 +----
zone1970.tab | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/zone.tab b/zone.tab
index 4904028..e6c600f 100644
--- a/zone.tab
+++ b/zone.tab
@@ -334,10 +334,7 @@ RO +4426+02606 Europe/Bucharest
RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
-# The obsolescent zone.tab format cannot represent Europe/Simferopol well.
-# Put it in RU section and list as UA. See "territorial claims" above.
-# Programs should use zone1970.tab instead; see above.
-UA +4457+03406 Europe/Simferopol Crimea
+RU +4457+03406 Europe/Simferopol Crimea
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan
diff --git a/zone1970.tab b/zone1970.tab
index cf9cf20..75d6c46 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -265,8 +265,7 @@ RO +4426+02606 Europe/Bucharest
RS,BA,HR,ME,MK,SI +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
-# Mention RU and UA alphabetically. See "territorial claims" above.
-RU,UA +4457+03406 Europe/Simferopol Crimea
+RU +4457+03406 Europe/Simferopol Crimea
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan
--
2.39.2

@ -3,7 +3,7 @@ Name: tzdata
Version: 2024b
%define tzdata_version 2024b
%define tzcode_version 2024b
Release: 2%{?dist}
Release: 2%{?dist}.inferit
License: Public Domain
URL: https://www.iana.org/time-zones
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@ -41,12 +41,17 @@ Patch104: 7133138.patch
Patch105: 8051641.patch
Patch106: javazic-harden-links.patch
# MSVSphere patches
Patch1001: 1001-Fix-Simferopol-country.patch
%description java
This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
%patch1001 -p1
%patch002 -p1
%if 0%{?rhel} || 0%{?eln}
%patch003 -p1
@ -180,6 +185,9 @@ echo ============END TESTING===========
%{_datadir}/javazi-1.8
%changelog
* Tue Nov 05 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2024b-2.inferit
- Update to 2024b-2
* Fri Sep 27 2024 Patsy Griffin <patsy@redhat.com> - 2024b-2
- Harden against links to removed zones (RHEL-60063)
@ -214,6 +222,9 @@ echo ============END TESTING===========
* Thu Aug 17 2023 Patsy Griffin <patsy@redhat.com> - 2023c-2
- Bump release to test recent process changes. (RHEL-1323)
* Tue Apr 11 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 2023c-1.inferit
- Fixed Simferopol country
* Tue Mar 28 2023 Patsy Griffin <patsy@redhat.com> - 2023c-1
- Rebase to tzdata-2023c
- Lebanon reversed the change added in tzdata-2023b.
@ -228,6 +239,9 @@ echo ============END TESTING===========
- Morocco springs forward April 23, not April 30.
- Palestine delayed the start of DST this year.
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2022d-1
- Rebuilt for MSVSphere 9.1.
* Fri Jan 6 2023 Patsy Griffin <patsy@redhat.com> - 2022g-2
- Include leap-seconds.list in tzdata install. (#2157982)

Loading…
Cancel
Save