From dcbe340345cf613537400df5aa8baedba8a734ad Mon Sep 17 00:00:00 2001 From: l00520965 Date: Mon, 23 Mar 2020 17:19:23 +0800 Subject: [PATCH] add Beijing timezone in zone1970.tab --- bugfix-0001-add-Beijing-timezone.patch | 22 ++++++++++++++++++---- tzdata.spec | 8 +++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/bugfix-0001-add-Beijing-timezone.patch b/bugfix-0001-add-Beijing-timezone.patch index 7bbe9ee..d7a596c 100644 --- a/bugfix-0001-add-Beijing-timezone.patch +++ b/bugfix-0001-add-Beijing-timezone.patch @@ -5,10 +5,11 @@ Subject: [PATCH] add Beijing timezone Signed-off-by: --- - asia | 2 ++ - backward | 2 +- - zone.tab | 3 ++- - 3 files changed, 5 insertions(+), 2 deletions(-) + asia | 2 ++ + backward | 2 +- + zone.tab | 3 ++- + zone1970.tab | 3 ++- + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/asia b/asia index 35774c6..2514bbf 100644 @@ -46,6 +47,19 @@ index 204048c..9eea19e 100644 CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai Beijing Time +CN +3955+11626 Asia/Beijing China Standard Time ++CN +3114+12128 Asia/Shanghai Shanghai Time + CN +4348+08735 Asia/Urumqi Xinjiang Time + CO +0436-07405 America/Bogota + CR +0956-08405 America/Costa_Rica +diff --git a/zone1970.tab b/zone1970.tab +--- a/zone1970.tab ++++ b/zone1970.tab +@@ -137,7 +137,8 @@ CK -2114-15946 Pacific/Rarotonga + CL -3327-07040 America/Santiago Chile (most areas) + CL -5309-07055 America/Punta_Arenas Region of Magallanes + CL -2709-10926 Pacific/Easter Easter Island +-CN +3114+12128 Asia/Shanghai Beijing Time ++CN +3955+11626 Asia/Beijing China Standard Time +CN +3114+12128 Asia/Shanghai Shanghai Time CN +4348+08735 Asia/Urumqi Xinjiang Time CO +0436-07405 America/Bogota diff --git a/tzdata.spec b/tzdata.spec index 16936f7..ecf7e5e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2019b -Release: 9 +Release: 10 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -118,6 +118,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Mar 23 2020 liuchao - 2019b-10 +- Type:recommended +- ID:NA +- SUG:NA +- DESC:add Beijing timezone in zone1970.tab + * Thu Jan 9 2020 liuchao - 2019b-9 - Type:recommended - ID:NA