From a7c69b7e4b7f1d47eebde0b0a28bac7f7a9a777b Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Mon, 3 Apr 2023 23:05:39 +0300 Subject: [PATCH] Fixes Simferopol country --- SOURCES/1001-Fix-Simferopol-country.patch | 43 +++++++++++++++++++++++ SPECS/tzdata.spec | 12 +++++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 SOURCES/1001-Fix-Simferopol-country.patch diff --git a/SOURCES/1001-Fix-Simferopol-country.patch b/SOURCES/1001-Fix-Simferopol-country.patch new file mode 100644 index 0000000..ae39fab --- /dev/null +++ b/SOURCES/1001-Fix-Simferopol-country.patch @@ -0,0 +1,43 @@ +From 1397d227e38f92c109b74a5b340ea4dfe9cc9d37 Mon Sep 17 00:00:00 2001 +From: Eugene Zamriy +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 + diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index 152bb23..92fa74a 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2022d %define tzdata_version 2022d %define tzcode_version 2022d -Release: 1%{?dist} +Release: 1%{?dist}.inferit License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -35,12 +35,17 @@ Patch102: rebase-02.patch Patch103: 7090844.patch Patch104: 7133138.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 @@ -151,8 +156,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 2022d-1 -- Rebuilt for MSVSphere 9.1. +* Mon Apr 03 2023 Eugene Zamriy - 2022d-1.inferit +- Fixed Simferopol country +- Rebuilt for MSVSphere 9.1 * Mon Sep 26 2022 Patsy Griffin - 2022d-1 - Rebase to tzdata-2022d