From 6be798bbfaf9701c07b26367c0714e8a1fde383eb54b6e38159daf773c09196b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 May 2018 09:21:50 +0000 Subject: [PATCH] Accepting request 606473 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/606473 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=68 --- python-numpy.changes | 6 ++++++ python-numpy.spec | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index 5d73f76..0fb7d71 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 10 16:24:04 UTC 2018 - toddrme2178@gmail.com + +- Fix issues with some targets not having certain versions of + openblas + ------------------------------------------------------------------- Sat Apr 28 22:05:55 UTC 2018 - toddrme2178@gmail.com diff --git a/python-numpy.spec b/python-numpy.spec index 0e1c176..e5265e8 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -32,23 +32,32 @@ ExclusiveArch: do_not_build %if "%flavor" == "standard" %bcond_with hpc - %ifarch armv6l s390 s390x m68k riscv64 + %if 0%{?sle_version} == 120300 && !0%{?is_opensuse} %bcond_with openblas %else - %bcond_without openblas + %ifarch armv6l s390 s390x m68k riscv64 + %bcond_with openblas + %else + %bcond_without openblas + %endif %endif %endif %if "%flavor" == "gnu-hpc" %bcond_without hpc + %bcond_without openblas %endif %if "%flavor" == "gnu7-hpc" %bcond_without hpc + %bcond_without openblas %define c_f_ver 7 %endif -%ifarch s390 +%if 0%{?sle_version} == 120300 +%{?with_openblas:ExclusiveArch: do_not_build} +%endif +%ifarch s390 s390x %{?with_openblas:ExclusiveArch: do_not_build} %endif