Fixes Simferopol country

i8 changed/i8/tzdata-2022g-2.el8.inferit
Sergey Cherevko 2 years ago
parent 8302c3a1a7
commit 3fbd04adc5
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -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: 2022g
%define tzdata_version 2022g
%define tzcode_version 2022g
Release: 2%{?dist}
Release: 2%{?dist}.inferit
License: Public Domain
Group: System Environment/Base
URL: https://www.iana.org/time-zones
@ -35,12 +35,17 @@ Patch103: 7090844.patch
Patch104: 7133138.patch
Patch105: 8051641.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
%patch003 -p1
@ -149,6 +154,10 @@ echo ============END TESTING===========
%{_datadir}/javazi-1.8
%changelog
* Thu Aug 03 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 2022g-2.inferit
- Fixed Simferopol country (patch from Eugene Zamriy was applied)
- Rebuilt for MSVSphere 8.8
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2022g-2
- Rebuilt for MSVSphere 8.8

Loading…
Cancel
Save