Accepting request 481630 from home:dimstar:Factory

- Apply pytz-2016.10-fix-tests-with-2017a.patch for Tumbleweed
  buildin.

OBS-URL: https://build.opensuse.org/request/show/481630
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=57
This commit is contained in:
Andreas Stieger 2017-03-20 23:26:51 +00:00 committed by Git OBS Bridge
parent 7710aff419
commit e101ac671c
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 20 19:55:27 UTC 2017 - dimstar@opensuse.org
- Apply pytz-2016.10-fix-tests-with-2017a.patch for Tumbleweed
buildin.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 16 02:58:11 UTC 2017 - toddrme2178@gmail.com Thu Mar 16 02:58:11 UTC 2017 - toddrme2178@gmail.com

View File

@ -32,9 +32,9 @@ Patch0: fix-tests.patch
# PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database) # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database)
Patch1: system_zoneinfo.patch Patch1: system_zoneinfo.patch
Patch2: pytz-2016.10-fix-tests-with-2017a.patch Patch2: pytz-2016.10-fix-tests-with-2017a.patch
BuildRequires: %{python_module devel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
# Test requirements # Test requirements
BuildRequires: %{python_module nose} BuildRequires: %{python_module nose}
BuildRequires: timezone BuildRequires: timezone
@ -62,8 +62,8 @@ Amost all of the Olson timezones are supported.
%patch0 -p1 %patch0 -p1
# Use system tz database # Use system tz database
%patch1 -p1 %patch1 -p1
# timezone 2017 a is currently only available in Leap 42.1 # timezone 2017 a is currently only available in Leap 42.1 and Tumbleweed
%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} %if 0%{?sle_version} == 120100 && 0%{?is_opensuse} || 0%{?suse_version} > 1320
%patch2 -p2 %patch2 -p2
%endif %endif