From 4fa9108c006cd5b744c2c713e160941735ae058abc38ac200be9de20998efcaa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Nov 2017 09:36:10 +0000 Subject: [PATCH] Accepting request 541237 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/541237 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=60 --- python-numpy.changes | 9 ++++++++- python-numpy.spec | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index 6a106a9..949e06a 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 12 12:49:48 UTC 2017 - eich@suse.com + +- Add Requires for libopenblas to base package. +- Add Requires for lua-lmod +- Fix '-' in environment variable mane of modulefile. + ------------------------------------------------------------------- Mon Oct 30 19:43:03 UTC 2017 - eich@suse.com @@ -32,7 +39,7 @@ Sat Sep 30 16:20:39 UTC 2017 - arun@gmx.de * #9732 BUG: Make scalar function elision check if temp is writeable. * #9736 BUG: Various fixes to np.gradient - * #9742 BUG: Fix np.pad for CVE-2017-12852 + * #9742 BUG: Fix np.pad for CVE-2017-12852 (bsc#1053963) * #9744 BUG: Check for exception in sort functions, add tests * #9745 DOC: Add whitespace after "versionadded::" directive so it actually... diff --git a/python-numpy.spec b/python-numpy.spec index f17a778..c5b1e1c 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -24,6 +24,8 @@ %bcond_with ringdisabled +%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') + %if "%flavor" == "" ExclusiveArch: do_not_build %endif @@ -98,6 +100,8 @@ BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: lua-lmod BuildRequires: suse-hpc +Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +Requires: lua-lmod %endif BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} @@ -218,8 +222,8 @@ if [ expr [ module-info mode load ] || [module-info mode display ] ] { prepend-path PATH %{hpc_bindir} prepend-path PYTHONPATH ${sitesearch_path} -setenv %{hpc_upcase %pname}_DIR %{hpc_prefix} -setenv %{hpc_upcase %pname}_BIN %{hpc_bindir} +setenv %{hpc_upcase_trans_hyph %pname}_DIR %{hpc_prefix} +setenv %{hpc_upcase_trans_hyph %pname}_BIN %{hpc_bindir} EOF }