Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pytz.git#208f8b156517cf74240b02a11593f5ea4a9054a3

pytz-zoneinfo.patch

@@ -1,5 +1,5 @@
 diff --git a/pytz/__init__.py b/pytz/__init__.py
-index d217c96..2b1ac03 100644
+index e2f49fa..65c1d11 100644
 --- a/pytz/__init__.py
 +++ b/pytz/__init__.py
 @@ -74,6 +74,9 @@ else:  # Python 2.x
@@ -38,9 +38,7 @@ index d217c96..2b1ac03 100644
      return open(filename, 'rb')
  
  
---- a/pytz/__init__.py~	2020-12-24 16:02:19.111185746 -0600
-+++ b/pytz/__init__.py	2020-12-28 13:16:13.399004167 -0600
-@@ -502,1044 +502,37 @@
+@@ -514,1044 +502,38 @@ def _test():
  
  if __name__ == '__main__':
      _test()
@@ -1095,9 +1093,10 @@ index d217c96..2b1ac03 100644
 - 'US/Pacific',
 - 'UTC']
 +
-+common_timezones = [l.split()[2]
-+        for l in open(os.path.join(_tzinfo_dir, 'zone.tab'))
-+        if l != '' and l[0] != '#']
++with open(os.path.join(_tzinfo_dir, 'zone.tab')) as zonetab:
++    common_timezones = [l.split()[2]
++            for l in zonetab
++            if l != '' and l[0] != '#']
 +common_timezones.extend(
 +        ['GMT',
 +         'US/Alaska',

pytz.spec

@@ -12,7 +12,7 @@
 
 Name:           pytz
 Version:        2021.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        World Timezone Definitions for Python
 
 License:        MIT
@@ -107,6 +107,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 
 
 %changelog
+* Tue Mar 16 2021 Miro Hrončok <mhroncok@redhat.com> - 2021.1-2
+- Always close the zone.tab file
+
 * Mon Feb 01 2021 Gwyn Ciesla <gwync@protonmail.com> - 2021.1-1
 - 2021.1