From ca2a40df89aa9151a3653f2068e02bc0bd6737098ce3f3c039db381fdb27fdc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 18 Sep 2020 11:23:54 +0000
Subject: [PATCH] Accepting request 835366 from
 home:eeich:branches:devel:languages:python:numeric

- Build only HPC version with OpenBLAS, use standard BLAS/LAPACK
  for non-HPC instead.
- Create a macro %ver for the package version number next to %_ver
  to help keep both in sync.

OBS-URL: https://build.opensuse.org/request/show/835366
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=73
---
 python-numpy.changes |  8 ++++++++
 python-numpy.spec    | 19 +++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/python-numpy.changes b/python-numpy.changes
index 6259e07..73ecd01 100644
--- a/python-numpy.changes
+++ b/python-numpy.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 18 08:19:50 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Build only HPC version with OpenBLAS, use standard BLAS/LAPACK
+  for non-HPC instead.
+- Create a macro %ver for the package version number next to %_ver
+  to help keep both in sync.
+
 -------------------------------------------------------------------
 Sat Sep 12 19:55:00 UTC 2020 - Arun Persaud <arun@gmx.de>
 
diff --git a/python-numpy.spec b/python-numpy.spec
index e3fcdfc..0817243 100644
--- a/python-numpy.spec
+++ b/python-numpy.spec
@@ -17,28 +17,22 @@
 
 
 %global flavor @BUILD_FLAVOR@%{nil}
-%define _ver 1_19_0
+%define ver 1.19.2
+%define _ver 1_19_2
 %define pname python-numpy
 %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
 %if "%{flavor}" == ""
  %bcond_with hpc
- %if 0%{?sle_version} == 120300 && !0%{?is_opensuse}
-  %bcond_with openblas
- %else
-  %ifarch armv6l s390 s390x m68k riscv64
-   %bcond_with openblas
-  %else
-   %bcond_without openblas
-  %endif
- %endif
+ %bcond_with openblas
 %endif
 %if "%{flavor}" == "gnu-hpc"
  %bcond_without hpc
- %bcond_without openblas
 %endif
 %if "%{flavor}" == "gnu7-hpc"
  %define c_f_ver 7
  %bcond_without hpc
+%endif
+%if %{with hpc}
  %bcond_without openblas
 %endif
 %if 0%{?sle_version} == 120300
@@ -70,7 +64,8 @@ ExclusiveArch:  do_not_build
 %endif
 %endif
 Name:           %{package_name}
-Version:        1.19.2
+# set %%ver and %%_ver instead above
+Version:        %ver
 Release:        0
 Summary:        NumPy array processing for numbers, strings, records and objects
 License:        BSD-3-Clause