!25 update pytz to 2022.6

From: @sherlock2010 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

0001-modify-timezone-from-Macau-to-Macao.patch

@@ -56,14 +56,14 @@ index c720561..cf0c701 100644
  9 _ +09/+10 1945 S 30 24
  8 _ C%sT
 @@ -4324,7 +4324,7 @@ L Asia/Dhaka Asia/Dacca
- L Asia/Shanghai Asia/Harbin
- L Asia/Urumqi Asia/Kashgar
+ L Asia/Dhaka Asia/Dacca
+ L Europe/Istanbul Asia/Istanbul
  L Asia/Kathmandu Asia/Katmandu
 -L Asia/Macau Asia/Macao
 +L Asia/Macao Asia/Macao
  L Asia/Yangon Asia/Rangoon
  L Asia/Ho_Chi_Minh Asia/Saigon
- L Asia/Jerusalem Asia/Tel_Aviv
+ L Asia/Thimphu Asia/Thimbu
 diff --git a/pytz/zoneinfo/zone.tab b/pytz/zoneinfo/zone.tab
 index 408fcb2..ee58572 100644
 --- a/pytz/zoneinfo/zone.tab

backport-pytz-zoneinfo.patch

@@ -14,7 +14,7 @@ index e2f49fa..65c1d11 100644
      """Open a resource from the zoneinfo subdir for reading.
 @@ -88,23 +91,8 @@ def open_resource(name):
      for part in name_parts:
-         if part == os.path.pardir or os.path.sep in part:
+         if part == os.path.pardir or os.sep in part:
              raise ValueError('Bad path segment: %r' % part)
 -    zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None)
 -    if zoneinfo_dir is not None:
@@ -40,7 +40,7 @@ index e2f49fa..65c1d11 100644
  
 --- a/pytz/__init__.py~	2021-10-04 09:16:08.981477792 -0500
 +++ b/pytz/__init__.py	2021-10-04 11:29:19.283758542 -0500
-@@ -502,1045 +502,37 @@
+@@ -502,1041 +502,37 @@
  
  if __name__ == '__main__':
      _test()
@@ -494,6 +494,7 @@ index e2f49fa..65c1d11 100644
 - 'Europe/Kaliningrad',
 - 'Europe/Kiev',
 - 'Europe/Kirov',
+- 'Europe/Kyiv',
 - 'Europe/Lisbon',
 - 'Europe/Ljubljana',
 - 'Europe/London',
@@ -807,7 +808,6 @@ index e2f49fa..65c1d11 100644
 - 'America/Montserrat',
 - 'America/Nassau',
 - 'America/New_York',
-- 'America/Nipigon',
 - 'America/Nome',
 - 'America/Noronha',
 - 'America/North_Dakota/Beulah',
@@ -824,7 +824,6 @@ index e2f49fa..65c1d11 100644
 - 'America/Porto_Velho',
 - 'America/Puerto_Rico',
 - 'America/Punta_Arenas',
-- 'America/Rainy_River',
 - 'America/Rankin_Inlet',
 - 'America/Recife',
 - 'America/Regina',
@@ -845,7 +844,6 @@ index e2f49fa..65c1d11 100644
 - 'America/Swift_Current',
 - 'America/Tegucigalpa',
 - 'America/Thule',
-- 'America/Thunder_Bay',
 - 'America/Tijuana',
 - 'America/Toronto',
 - 'America/Tortola',
@@ -997,8 +995,8 @@ index e2f49fa..65c1d11 100644
 - 'Europe/Istanbul',
 - 'Europe/Jersey',
 - 'Europe/Kaliningrad',
-- 'Europe/Kiev',
 - 'Europe/Kirov',
+- 'Europe/Kyiv',
 - 'Europe/Lisbon',
 - 'Europe/Ljubljana',
 - 'Europe/London',
@@ -1026,7 +1024,6 @@ index e2f49fa..65c1d11 100644
 - 'Europe/Tallinn',
 - 'Europe/Tirane',
 - 'Europe/Ulyanovsk',
-- 'Europe/Uzhgorod',
 - 'Europe/Vaduz',
 - 'Europe/Vatican',
 - 'Europe/Vienna',
@@ -1034,7 +1031,6 @@ index e2f49fa..65c1d11 100644
 - 'Europe/Volgograd',
 - 'Europe/Warsaw',
 - 'Europe/Zagreb',
-- 'Europe/Zaporozhye',
 - 'Europe/Zurich',
 - 'GMT',
 - 'Indian/Antananarivo',

pytz.spec

@@ -1,12 +1,12 @@
 %bcond_without tests
 
 Name:		pytz
-Version:	2021.3
-Release:	3
+Version:	2022.6
+Release:	1
 Summary:	World Timezone Definitions for Python
 License:	MIT
 URL:		http://pytz.sourceforge.net/
-Source0:	https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a/pytz-2021.3.tar.gz
+Source0:	https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d806f5e063d4d34631b71b832fac715a8/pytz-2022.6.tar.gz
 
 Patch0:         backport-pytz-zoneinfo.patch
 Patch1:         backport-remove_tzinfo_test.patch
@@ -57,6 +57,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 %{python3_sitelib}/*
 
 %changelog
+* Mon Nov 14 2022 zhouyihang <zhouyihang3@h-partners.com> - 2022.6-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update pytz to 2022.6
+
 * Thu Jun 30 2022 gaihuiying <eaglegai@163.com> - 2021.3-3
 - Type:bugfix
 - ID:NA