Accepting request 466178 from home:AndreasStieger:branches:devel:languages:python
update to 2016.10 bsc#1027705 and singlespec OBS-URL: https://build.opensuse.org/request/show/466178 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=44
This commit is contained in:
Denisart Benjamin
Git OBS Bridge
parent
52aad7b2c1
commit
fc54993add
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 2 16:39:42 UTC 2017 - astieger@suse.com
|
||||
|
||||
- update to 2016.10:
|
||||
* includes IANA 2016j
|
||||
* No longer fails with timezone-2017a bsc#1027705
|
||||
* drop upstreamed system_zoneinfo.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 19 17:43:19 UTC 2016 - jmatejek@suse.com
|
||||
|
||||
- update for multipython build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 08:10:27 UTC 2016 - astieger@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-pytz
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,24 +16,24 @@
|
||||
#
|
||||
|
||||
|
||||
%{?!python_module:%define python_module() python-%1 python3-%1}
|
||||
Name: python-pytz
|
||||
Version: 2016.4
|
||||
Version: 2016.10
|
||||
Release: 0
|
||||
Summary: World timezone definitions, modern and historical
|
||||
License: MIT
|
||||
Group: Development/Languages/Python
|
||||
Url: http://pytz.sourceforge.net
|
||||
Source: https://pypi.python.org/packages/f4/7d/7c0c85e9c64a75dde11bc9d3e1adc4e09a42ce7cdb873baffa1598118709/pytz-2016.4.tar.bz2
|
||||
Source2: https://pypi.python.org/packages/f4/7d/7c0c85e9c64a75dde11bc9d3e1adc4e09a42ce7cdb873baffa1598118709/pytz-2016.4.tar.bz2.asc
|
||||
Source: https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3/pytz-2016.10.tar.bz2
|
||||
Source2: https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3/pytz-2016.10.tar.bz2.asc
|
||||
Source90: pytz.keyring
|
||||
# PATCH-FIX-UPSTREAM fix-tests.patch -- Remote tests which are known to be broken
|
||||
Patch0: fix-tests.patch
|
||||
# PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database)
|
||||
Patch1: system_zoneinfo.patch
|
||||
Requires: timezone
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module nose}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-nose
|
||||
BuildRequires: python-rpm-macros
|
||||
# Tests will use this package
|
||||
BuildRequires: timezone
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -46,6 +46,8 @@ BuildArch: noarch
|
||||
Provides: python-tz = 2014b
|
||||
Obsoletes: python-tz < 2014b
|
||||
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
pytz - World Timezone Definitions for Python
|
||||
pytz brings the Olson tz database into Python. This library allows
|
||||
@ -60,28 +62,24 @@ Amost all of the Olson timezones are supported.
|
||||
%setup -q -n pytz-%{version}
|
||||
# Disable test which is not working (and documented so)
|
||||
%patch0 -p1
|
||||
%if 0%{?suse_version} >= 1310
|
||||
# Use system tz database
|
||||
%patch1 -p1
|
||||
%endif
|
||||
# For rpmlint warning: remove shebang from python library:
|
||||
sed -i '/^#!/d' ./pytz/tzfile.py
|
||||
|
||||
%build
|
||||
python setup.py build
|
||||
%python_build
|
||||
|
||||
%install
|
||||
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||
%python_install
|
||||
# Remove the pytz zoneinfo only if we use the system tz database
|
||||
%if 0%{?suse_version} >= 1310
|
||||
rm -fr %{buildroot}%{python_sitelib}/pytz/zoneinfo
|
||||
%endif
|
||||
%fdupes %{buildroot}%{python_sitelib}
|
||||
%{python_expand %fdupes %{buildroot}%{$python_sitelib}}
|
||||
|
||||
%check
|
||||
nosetests
|
||||
%{python_expand nosetests-%$python_bin_suffix}
|
||||
|
||||
%files
|
||||
%files %{python_files}
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE.txt README.txt
|
||||
%{python_sitelib}/*
|
||||
|
||||
3
pytz-2016.10.tar.bz2
Normal file
3
pytz-2016.10.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b
|
||||
size 172920
|
||||
7
pytz-2016.10.tar.bz2.asc
Normal file
7
pytz-2016.10.tar.bz2.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAlhGjDcACgkQAfqZj7rGN0qkzACdHUgHv+qfjc6+vHuInFZQD5od
|
||||
DVwAniNLVslM9oeAXOWa9oQge2gbJuws
|
||||
=4xm3
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ee7c751544e35a7b7fb5e3fb25a49dade37d51e70a93e5107f10575d7102c311
|
||||
size 171959
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlcaIxIACgkQAfqZj7rGN0pJ2ACfbHdK2WdyrymaAVFBBnSC7OAI
|
||||
bd8AoIX2+ga13T2KGW3HPwj1fjtJLNUL
|
||||
=ZpuM
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,44 +0,0 @@
|
||||
Index: pytz-2014.9/pytz/__init__.py
|
||||
===================================================================
|
||||
--- pytz-2014.9.orig/pytz/__init__.py
|
||||
+++ pytz-2014.9/pytz/__init__.py
|
||||
@@ -25,11 +25,6 @@ __all__ = [
|
||||
|
||||
import sys, datetime, os.path, gettext
|
||||
|
||||
-try:
|
||||
- from pkg_resources import resource_stream
|
||||
-except ImportError:
|
||||
- resource_stream = None
|
||||
-
|
||||
from pytz.exceptions import AmbiguousTimeError
|
||||
from pytz.exceptions import InvalidTimeError
|
||||
from pytz.exceptions import NonExistentTimeError
|
||||
@@ -86,13 +81,7 @@ def open_resource(name):
|
||||
for part in name_parts:
|
||||
if part == os.path.pardir or os.path.sep in part:
|
||||
raise ValueError('Bad path segment: %r' % part)
|
||||
- filename = os.path.join(os.path.dirname(__file__),
|
||||
- 'zoneinfo', *name_parts)
|
||||
- if not os.path.exists(filename) and resource_stream is not None:
|
||||
- # http://bugs.launchpad.net/bugs/383171 - we avoid using this
|
||||
- # unless absolutely necessary to help when a broken version of
|
||||
- # pkg_resources is installed.
|
||||
- return resource_stream(__name__, 'zoneinfo/' + name)
|
||||
+ filename = os.path.join('/usr/share/zoneinfo', *name_parts)
|
||||
return open(filename, 'rb')
|
||||
|
||||
|
||||
Index: pytz-2014.9/pytz/tzfile.py
|
||||
===================================================================
|
||||
--- pytz-2014.9.orig/pytz/tzfile.py
|
||||
+++ pytz-2014.9/pytz/tzfile.py
|
||||
@@ -127,7 +127,7 @@ def build_tzinfo(zone, fp):
|
||||
if __name__ == '__main__':
|
||||
import os.path
|
||||
from pprint import pprint
|
||||
- base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
|
||||
+ base = '/usr/share/zoneinfo'
|
||||
tz = build_tzinfo('Australia/Melbourne',
|
||||
open(os.path.join(base,'Australia','Melbourne'), 'rb'))
|
||||
tz = build_tzinfo('US/Eastern',
|
||||
Loading…
Reference in New Issue
Block a user