diff --git a/.gitignore b/.gitignore index bfc1a7e..39f5e80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pytz-2010h.tar.gz /pytz-2012d.tar.gz /pytz-2015.4.tar.gz +/pytz-2015.7.tar.gz diff --git a/pytz-zoneinfo.patch b/pytz-zoneinfo.patch index f828fd2..9d860af 100644 --- a/pytz-zoneinfo.patch +++ b/pytz-zoneinfo.patch @@ -1,6 +1,6 @@ -diff -up pytz-2015.4/pytz/__init__.py.orig pytz-2015.4/pytz/__init__.py ---- pytz-2015.4/pytz/__init__.py.orig 2015-05-13 04:50:26.000000000 -0600 -+++ pytz-2015.4/pytz/__init__.py 2015-08-30 14:56:56.837511078 -0600 +diff -up pytz-2015.7/pytz/__init__.py.zoneinfo pytz-2015.7/pytz/__init__.py +--- pytz-2015.7/pytz/__init__.py.zoneinfo 2015-10-26 00:30:26.000000000 -0600 ++++ pytz-2015.7/pytz/__init__.py 2015-10-26 09:55:20.891455592 -0600 @@ -75,24 +75,19 @@ else: # Python 2.x """ return s.encode('US-ASCII') @@ -30,7 +30,7 @@ diff -up pytz-2015.4/pytz/__init__.py.orig pytz-2015.4/pytz/__init__.py return open(filename, 'rb') -@@ -487,1025 +482,36 @@ def _test(): +@@ -487,1027 +482,36 @@ def _test(): if __name__ == '__main__': _test() @@ -146,6 +146,7 @@ diff -up pytz-2015.4/pytz/__init__.py.orig pytz-2015.4/pytz/__init__.py - 'America/Eirunepe', - 'America/El_Salvador', - 'America/Ensenada', +- 'America/Fort_Nelson', - 'America/Fort_Wayne', - 'America/Fortaleza', - 'America/Glace_Bay', @@ -735,6 +736,7 @@ diff -up pytz-2015.4/pytz/__init__.py.orig pytz-2015.4/pytz/__init__.py - 'America/Edmonton', - 'America/Eirunepe', - 'America/El_Salvador', +- 'America/Fort_Nelson', - 'America/Fortaleza', - 'America/Glace_Bay', - 'America/Godthab', diff --git a/pytz.spec b/pytz.spec index e5f6087..3fb49b1 100644 --- a/pytz.spec +++ b/pytz.spec @@ -5,7 +5,7 @@ %endif Name: pytz -Version: 2015.4 +Version: 2015.7 Release: 1%{?dist} Summary: World Timezone Definitions for Python @@ -54,7 +54,7 @@ Almost all (over 540) of the Olson timezones are supported. %prep %setup -q -%patch0 -p1 -b .zonezinfo +%patch0 -p1 -b .zoneinfo %build @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 26 2015 Orion Poplawski - 2015.7-1 +- Update to 2015.7 + * Sun Aug 30 2015 Orion Poplawski - 2015.4-1 - Update to 2015.4 (bug #1161236) - Do not ship zoneinfo with python3 package (bug #1251554) diff --git a/sources b/sources index 6f7de18..82623d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -417a47b1c432d90333e42084a605d3d8 pytz-2015.4.tar.gz +252bb731883f37ff9c7f462954e8706d pytz-2015.7.tar.gz