From 4cfc48f7278ac74a824edd08e195bf906acca839378f1e00f20f2f8316f285e4 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Fri, 19 Jul 2024 06:04:45 +0000
Subject: [PATCH] - Remove numpy1 hpc master package: One numpy is enough -
 Remove mistaken pycache rpmlintrc filter - Provide a release number in rpm
 version

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy1?expand=0&rev=4
---
 python-numpy1-rpmlintrc |  3 ---
 python-numpy1.changes   |  7 +++++++
 python-numpy1.spec      | 29 +++++++++++++++++------------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/python-numpy1-rpmlintrc b/python-numpy1-rpmlintrc
index cbab7ac..9ca22d5 100644
--- a/python-numpy1-rpmlintrc
+++ b/python-numpy1-rpmlintrc
@@ -5,6 +5,3 @@ addFilter("devel-file-in-non-devel-package .*numpy/core/tests/data")
 addFilter("hidden-file-or-dir .*numpy/f2py/tests/src/assumed_shape/.f2py_f2cmap")
 addFilter("hidden-file-or-dir .*numpy/f2py/tests/src/f2cmap/.f2py_f2cmap")
 addFilter("zero-length .*numpy/_core/__init__.pyi")
-# The pyc files are created after the py files, but the mtime of the pyc file,
-# its internal timestamp and the mtime of the py file are not equal.
-addFilter("python-bytecode-inconsistent-mtime .*")
diff --git a/python-numpy1.changes b/python-numpy1.changes
index 2b74a02..9c02c71 100644
--- a/python-numpy1.changes
+++ b/python-numpy1.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 11 08:01:45 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Remove numpy1 hpc master package: One numpy is enough
+- Remove mistaken pycache rpmlintrc filter
+- Provide a release number in rpm version
+
 -------------------------------------------------------------------
 Tue Jul  2 04:42:07 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-numpy1.spec b/python-numpy1.spec
index 937492e..cb593cb 100644
--- a/python-numpy1.spec
+++ b/python-numpy1.spec
@@ -19,7 +19,6 @@
 %global flavor @BUILD_FLAVOR@%{nil}
 %define ver 1.26.4
 %define _ver 1_26_4
-%define pname python-numpy1
 %define plainpython python
 %define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
 %if "%{flavor}" == ""
@@ -36,6 +35,13 @@
 %if %{with hpc}
  %bcond_without openblas
 %endif
+
+%if %{without hpc}
+%define pname python-numpy1
+%else
+%define pname python-numpy
+%endif
+
 %if 0%{?sle_version} == 120300
 %{?with_openblas:ExclusiveArch:  do_not_build}
 %endif
@@ -120,8 +126,8 @@ 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
-Provides:       python-numpy = %{version}
-Conflicts:      python-numpy > %{version}
+Conflicts:      python-numpy >= 2
+Provides:       python-numpy = %{version}-%{release}
 %if 0%{?suse_version}
 BuildRequires:  gcc-fortran
 %else
@@ -148,7 +154,6 @@ Requires(postun): update-alternatives
 %else
 BuildRequires:  %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
 BuildRequires:  libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
-Provides:       python-numpy_1_26_4-gnu-hpc = %{version}
 %ifnarch %ix86 %arm
 BuildRequires:  lua-lmod
 %endif
@@ -157,6 +162,8 @@ Requires:       libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
 %endif
 %python_subpackages
 
+# Note: the hpc master package is provided by numpy 2 only
+
 %description
 NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
@@ -169,7 +176,6 @@ interfacing with general-purpose data-base applications.
 There are also basic facilities for discrete fourier transform,
 basic linear algebra and random number generation.
 
-%{?with_hpc:%{hpc_python_master_package -L -a }}
 
 %package devel
 Summary:        Development files for numpy applications
@@ -177,22 +183,21 @@ Requires:       %{name} = %{version}
 Requires:       python-devel
 Requires:       %plainpython(abi) = %{python_version}
 %if %{without hpc}
-Provides:       python-numpy-devel = %{version}
-Conflicts:      python-numpy-devel > %{version}
+Conflicts:      python-numpy-devel >= 2
+Provides:       python-numpy-devel = %{version}-%{release}
 %if %{with openblas}
 Requires:       openblas-devel
-%else  # openblas
+%else
 Requires:       blas-devel
 %if %{with cblas}
 Requires:       cblas-devel
-%endif # cblas
+%endif
 Requires:       lapack-devel
 %endif
-%else # hpc
+%else
 Requires:       libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
 %{hpc_requires_devel}
-Provides:       python-numpy_1_26_4-gnu-hpc-devel
-%endif # hpc
+%endif
 
 %description devel
 This package contains files for developing applications using numpy.