From 381812c30600c2aab5bc6cebccdd54cc806601ca Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Wed, 25 Dec 2024 12:55:53 +0300 Subject: [PATCH] Fixed Simferopol country --- SOURCES/1001-Fix-Simferopol-country.patch | 43 +++++++++++++++++++++++ SPECS/tzdata.spec | 10 +++++- 2 files changed, 52 insertions(+), 1 deletion(-) 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 6b153da..4e4bc62 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 3%{?dist} +Release: 3%{?dist}.inferit License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0) URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -12,6 +12,9 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz Patch002: 0002-Fix-have-snprintf-error.patch Patch003: 0003-continue-to-ship-posixrules.patch +# MSVSphere patches +Patch1001: 1001-Fix-Simferopol-country.patch + BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel @@ -35,6 +38,8 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +%patch1001 -p1 + %patch -p1 -P 2 %if 0%{?rhel} %patch -p1 -P 3 @@ -114,6 +119,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Dec 25 2024 Sergey Cherevko - 2024a-3.inferit +- Fixed Simferopol country + * Tue Nov 26 2024 MSVSphere Packaging Team - 2024a-3 - Rebuilt for MSVSphere 10