From e101ac671c9dc5dbd4371be4626518fd2239c24707f85a28150a182bdef5ae3e Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Mon, 20 Mar 2017 23:26:51 +0000 Subject: [PATCH] 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 --- python-pytz.changes | 6 ++++++ python-pytz.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/python-pytz.changes b/python-pytz.changes index b1c08d2..6f87075 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -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 diff --git a/python-pytz.spec b/python-pytz.spec index 1d81f64..d5918b4 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -32,9 +32,9 @@ Patch0: fix-tests.patch # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database) Patch1: system_zoneinfo.patch Patch2: pytz-2016.10-fix-tests-with-2017a.patch +BuildRequires: %{python_module devel} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: %{python_module devel} # Test requirements BuildRequires: %{python_module nose} BuildRequires: timezone @@ -62,8 +62,8 @@ Amost all of the Olson timezones are supported. %patch0 -p1 # Use system tz database %patch1 -p1 -# timezone 2017 a is currently only available in Leap 42.1 -%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} +# timezone 2017 a is currently only available in Leap 42.1 and Tumbleweed +%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} || 0%{?suse_version} > 1320 %patch2 -p2 %endif