From 3f91cc86e3001b6db7ab40fd08180df03fd2a30f15c674ed6561577e46955a60 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Jan 2023 10:00:01 +0000 Subject: [PATCH] Accepting request 1060300 from home:bnavigator:branches:devel:languages:python:numeric - Slightly reformat the specfile condition blocks: The %python_subpackages generator misses " %if" lines with a preceding whitespace. Relevant for d:l:p:backports not having libalternatives. OBS-URL: https://build.opensuse.org/request/show/1060300 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=114 --- python-numpy.changes | 8 ++++++++ python-numpy.spec | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index ab1ff1c..b0cd620 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 22 19:55:11 UTC 2023 - Ben Greiner + +- Slightly reformat the specfile condition blocks: The + %python_subpackages generator misses " %if" lines with a + preceding whitespace. Relevant for d:l:p:backports not having + libalternatives. + ------------------------------------------------------------------- Mon Jan 2 19:31:48 UTC 2023 - Ben Greiner diff --git a/python-numpy.spec b/python-numpy.spec index 640b37f..db84159 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -103,27 +103,27 @@ BuildRequires: %{python_module typing-extensions >= 4.2.0} %if %{without hpc} # Last version which packaged %%{_bindir}/f2py without update-alternatives Conflicts: %{plainpython}-numpy <= 1.12.0 - %if 0%{?suse_version} +%if 0%{?suse_version} BuildRequires: gcc-fortran - %else +%else BuildRequires: gcc-gfortran - %endif - %if %{with openblas} +%endif +%if %{with openblas} BuildRequires: openblas-devel > 0.3.20 - %else +%else BuildRequires: blas-devel BuildRequires: cblas-devel BuildRequires: lapack-devel # openblas has significantly better performance for some operations Recommends: libopenblas_pthreads0 - %endif - %if %{with libalternatives} +%endif +%if %{with libalternatives} BuildRequires: alts Requires: alts - %else +%else Requires(post): update-alternatives Requires(postun):update-alternatives - %endif +%endif %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel