update to 2021b

Samoa-no-longer-observes-DST.patch

@@ -1,39 +0,0 @@
-From 29583c461a9705118560e02e69bb64a0bf2fce0c Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 20 Sep 2021 00:23:09 -0700
-Subject: [PATCH] Samoa no longer observes DST
-
-(Thanks to Geoffrey D. Bennett.)
-* NEWS: Mention this.
-* australasia: Last DST transition was April.
----
- australasia | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/australasia b/australasia
-index c68a445..6fe681b 100644
---- a/australasia
-+++ b/australasia
-@@ -753,13 +753,17 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1892 Jul  5
- # From Paul Eggert (2014-07-08):
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-+#
-+# From Geoffrey D. Bennett (2021-09-20):
-+# https://www.mcil.gov.ws/storage/2021/09/MCIL-Scan_20210920_120553.pdf
-+# DST has been cancelled for this year.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	WS	2010	only	-	Sep	lastSun	0:00	1	-
- Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	-
- Rule	WS	2011	only	-	Sep	lastSat	3:00	1	-
--Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	-
--Rule	WS	2012	max	-	Sep	lastSun	3:00	1	-
-+Rule	WS	2012	2021	-	Apr	Sun>=1	4:00	0	-
-+Rule	WS	2012	2020	-	Sep	lastSun	3:00	1	-
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone Pacific/Apia	 12:33:04 -	LMT	1892 Jul  5
- 			-11:26:56 -	LMT	1911
--- 
-2.23.0
-

bugfix-0001-add-Beijing-timezone.patch

@@ -21,9 +21,9 @@ index e13ae52..348f99e 100644
  Link	America/Denver		Navajo
 -Link	Asia/Shanghai		PRC
 +Link	Asia/Beijing		PRC
+ Link	Pacific/Kanton		Pacific/Enderbury
  Link	Pacific/Honolulu	Pacific/Johnston
- Link	Pacific/Pohnpei		Pacific/Ponape
- Link	Pacific/Pago_Pago	Pacific/Samoa
+ Link	Pacific/Pago_Pago	Pacific/Midway
 diff --git a/zone.tab b/zone.tab
 index 8d056e3..cfd90aa 100644
 --- a/zone.tab

remove-Israel-timezone.patch

@@ -2,9 +2,9 @@ diff --git a/backward b/backward
 index 601977d..107738c 100644
 --- a/backward
 +++ b/backward
-@@ -89,7 +89,6 @@ Link	Etc/GMT			Greenwich
- Link	Asia/Hong_Kong		Hongkong
- Link	Atlantic/Reykjavik	Iceland
+@@ -89,7 +89,6 @@ Link	Africa/Nairobi		Indian/Antananarivo
+ Link	Africa/Nairobi		Indian/Comoro
+ Link	Africa/Nairobi		Indian/Mayotte
  Link	Asia/Tehran		Iran
 -Link	Asia/Jerusalem		Israel
  Link	America/Jamaica		Jamaica

rename-Macau-to-Macao.patch

@@ -147,14 +147,14 @@ diff --git a/backward b/backward
 index d13e811..601977d 100644
 --- a/backward
 +++ b/backward
-@@ -38,7 +38,6 @@ Link	Asia/Dhaka		Asia/Dacca
- Link	Asia/Shanghai		Asia/Harbin
+@@ -38,7 +38,6 @@ Link	Europe/Istanbul		Asia/Istanbul
  Link	Asia/Urumqi		Asia/Kashgar
  Link	Asia/Kathmandu		Asia/Katmandu
+ Link	Asia/Riyadh		Asia/Kuwait
 -Link	Asia/Macau		Asia/Macao
+ Link	Asia/Dubai		Asia/Muscat
+ Link	Asia/Bangkok		Asia/Phnom_Penh
  Link	Asia/Yangon		Asia/Rangoon
- Link	Asia/Ho_Chi_Minh	Asia/Saigon
- Link	Asia/Jerusalem		Asia/Tel_Aviv
 diff --git a/iso3166.tab b/iso3166.tab
 index a4ff61a..1c53cc0 100644
 --- a/iso3166.tab

tzdata.spec

@@ -1,6 +1,6 @@
 Name:		tzdata
-Version:	2021a
-Release:	4
+Version:	2021b
+Release:	1
 Summary:	Timezone data
 License:	Public Domain
 URL:		https://www.iana.org/time-zones
@@ -9,8 +9,6 @@ Source1:	https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
 Source2:	javazic.tar.gz
 Source3:	javazic-1.8-37392f2f5d59.tar.xz
 
-Patch6000:	Samoa-no-longer-observes-DST.patch
-
 Patch9000:	bugfix-0001-add-Beijing-timezone.patch
 Patch9001:	remove-country-selection-from-tzselect-steps.patch
 Patch9002:	remove-ROC-timezone.patch
@@ -109,6 +107,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Sep 26 2021 liuchao<liuchao173@huawei.com> - 2021b-1
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:update to 2021b
+
 * Thu Sep 23 2021 liuchao<liuchao173@huawei.com> - 2021a-4
 - Type:bugfix
 - CVE:NA