From 75361ee0c247a7bee8fa240ee2bef4f80bc1371a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 11:31:42 +0100 Subject: [PATCH] py36: remove conflicting %{_bindir}/f2py [release 1.16.2-2mamba;Mon Mar 18 2019] --- python-numpy.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/python-numpy.spec b/python-numpy.spec index a384a54..ec56fb9 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,13 +1,14 @@ Name: python-numpy -Version: 1.11.2 -Release: 1mamba +Version: 1.16.2 +Release: 2mamba Summary: NumPy: Scientific computing with Python NumPy Group: System/Libraries/Python Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://numpy.scipy.org -Source: http://downloads.sourceforge.net/project/numpy/NumPy/%{version}/numpy-%{version}.tar.gz +Source: https://pypi.debian.net/numpy/numpy-%{version}.zip +#Source: http://downloads.sourceforge.net/project/numpy/NumPy/%{version}/numpy-%{version}.zip License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -41,6 +42,7 @@ This allows NumPy to seamlessly and speedily integrate with a wide variety of da %package py%{pyver} Group: System/Libraries/Python Summary: NumPy: array processing for numbers, strings, records, and objects +Obsoletes: python-numpy-py3 %py_requires %description py%{pyver} @@ -68,7 +70,11 @@ CFLAGS="%{optflags}" %{__python} setup.py build --install-headers=%{python_inc} \ --install-lib=%{python_sitearch} -install -D -p -m 0644 doc/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py%{pyver}.1 +#install -D -p -m 0644 doc/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py%{pyver}.1 + +%if 0%{?with_pyver} +rm -f %{buildroot}%{_bindir}/f2py +%endif %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -76,12 +82,18 @@ install -D -p -m 0644 doc/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py%{pyver}.1 %files %{?pyappend} %defattr(-,root,root) %{_bindir}/f2py* -%{_mandir}/man1/f2py* +#%{_mandir}/man1/f2py* %dir %{python_sitearch}/numpy %{python_sitearch}/numpy/* %{python_sitearch}/numpy-%{version}-py*.egg-info %changelog +* Mon Mar 18 2019 Silvan Calarco 1.16.2-2mamba +- py36: remove conflicting %{_bindir}/f2py + +* Sun Mar 17 2019 Silvan Calarco 1.16.2-1mamba +- update to 1.16.2 + * Thu Oct 06 2016 Automatic Build System 1.11.2-1mamba - automatic version update by autodist