Correct Conflicts/Provides for python-numpy

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy1?expand=0&rev=3
This commit is contained in:
2024-07-02 04:42:38 +00:00
committed by Git OBS Bridge
parent b443934fa2
commit 695e7f9ce9
2 changed files with 11 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 28 06:48:02 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com> Tue Jul 2 04:42:07 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Rename this to numpy1 to keep it around. - Rename this to numpy1 to keep it around.

View File

@@ -120,6 +120,8 @@ BuildRequires: %{python_module typing-extensions >= 4.2.0}
%if %{without hpc} %if %{without hpc}
# Last version which packaged %%{_bindir}/f2py without update-alternatives # Last version which packaged %%{_bindir}/f2py without update-alternatives
Conflicts: %{plainpython}-numpy <= 1.12.0 Conflicts: %{plainpython}-numpy <= 1.12.0
Provides: python-numpy = %{version}
Conflicts: python-numpy > %{version}
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
%else %else
@@ -146,14 +148,13 @@ Requires(postun): update-alternatives
%else %else
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
Provides: python-numpy_1_26_4-gnu-hpc = %{version}
%ifnarch %ix86 %arm %ifnarch %ix86 %arm
BuildRequires: lua-lmod BuildRequires: lua-lmod
%endif %endif
BuildRequires: suse-hpc BuildRequires: suse-hpc
Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
%endif %endif
Provides: python-numpy = %{version}
Conflicts: python-numpy > %{version}
%python_subpackages %python_subpackages
%description %description
@@ -176,19 +177,22 @@ Requires: %{name} = %{version}
Requires: python-devel Requires: python-devel
Requires: %plainpython(abi) = %{python_version} Requires: %plainpython(abi) = %{python_version}
%if %{without hpc} %if %{without hpc}
Provides: python-numpy-devel = %{version}
Conflicts: python-numpy-devel > %{version}
%if %{with openblas} %if %{with openblas}
Requires: openblas-devel Requires: openblas-devel
%else %else # openblas
Requires: blas-devel Requires: blas-devel
%if %{with cblas} %if %{with cblas}
Requires: cblas-devel Requires: cblas-devel
%endif %endif # cblas
Requires: lapack-devel Requires: lapack-devel
%endif %endif
%else %else # hpc
Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
%{hpc_requires_devel} %{hpc_requires_devel}
%endif Provides: python-numpy_1_26_4-gnu-hpc-devel
%endif # hpc
%description devel %description devel
This package contains files for developing applications using numpy. This package contains files for developing applications using numpy.