From 0f20b83c83cd7f8670357560c26b703e00723e1d Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Tue, 7 Jan 2020 14:28:12 +0800 Subject: [PATCH 1/2] remove duplicate patch suffix --- ...l_Aaiun-timezone.patch.patch => remove-El_Aaiun-timezone.patch | 0 ...ve-Israel-timezone.patch.patch => remove-Israel-timezone.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename remove-El_Aaiun-timezone.patch.patch => remove-El_Aaiun-timezone.patch (100%) rename remove-Israel-timezone.patch.patch => remove-Israel-timezone.patch (100%) diff --git a/remove-El_Aaiun-timezone.patch.patch b/remove-El_Aaiun-timezone.patch similarity index 100% rename from remove-El_Aaiun-timezone.patch.patch rename to remove-El_Aaiun-timezone.patch diff --git a/remove-Israel-timezone.patch.patch b/remove-Israel-timezone.patch similarity index 100% rename from remove-Israel-timezone.patch.patch rename to remove-Israel-timezone.patch From f24e51819502c955ab3ad25043e6a396e3309a4c Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Tue, 7 Jan 2020 14:28:12 +0800 Subject: [PATCH 2/2] remove duplicate patch suffix --- ...e.patch.patch => remove-El_Aaiun-timezone.patch | 0 ...one.patch.patch => remove-Israel-timezone.patch | 0 tzdata.spec | 14 ++++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) rename remove-El_Aaiun-timezone.patch.patch => remove-El_Aaiun-timezone.patch (100%) rename remove-Israel-timezone.patch.patch => remove-Israel-timezone.patch (100%) diff --git a/remove-El_Aaiun-timezone.patch.patch b/remove-El_Aaiun-timezone.patch similarity index 100% rename from remove-El_Aaiun-timezone.patch.patch rename to remove-El_Aaiun-timezone.patch diff --git a/remove-Israel-timezone.patch.patch b/remove-Israel-timezone.patch similarity index 100% rename from remove-Israel-timezone.patch.patch rename to remove-Israel-timezone.patch diff --git a/tzdata.spec b/tzdata.spec index 8e29333..64fb306 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2019b -Release: 7 +Release: 8 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -17,6 +17,8 @@ Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch Patch9002: remove-ROC-timezone.patch Patch9003: rename-Macau-to-Macao.patch +Patch9004: remove-El_Aaiun-timezone.patch +Patch9005: remove-Israel-timezone.patch BuildRequires: gawk glibc perl-interpreter BuildRequires: java-devel @@ -49,6 +51,8 @@ This package contains timezone information for use by Java runtimes. %patch9001 -p1 %patch9002 -p1 %patch9003 -p1 +%patch9004 -p1 +%patch9005 -p1 make VERSION=%{version} tzdata%{version}-rearguard.tar.gz tar zxf tzdata%{version}-rearguard.tar.gz @@ -120,11 +124,17 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Jan 8 2020 liuchao - 2019b-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove Israel and El_Aaiun timezone + * Thu Jan 2 2020 liuchao - 2019b-7 - Type:bugfix - ID:NA - SUG:NA -- DESC:remove Israel and El_Aaiun timezone and sync community patches +- DESC:sync community patches * Wed Dec 4 2019 liuchao - 2019b-6 - Type:recommended