diff --git a/scipy-1.10.1.tar.gz b/scipy-1.11.3.tar.gz similarity index 67% rename from scipy-1.10.1.tar.gz rename to scipy-1.11.3.tar.gz index cdfd6ef9b19213c870dc96a58ff6eb7d60ba4a6a..2497c3c827e2d02862a0858ae127199dc3b05c02 100644 Binary files a/scipy-1.10.1.tar.gz and b/scipy-1.11.3.tar.gz differ diff --git a/scipy.spec b/scipy.spec index 568a2c7a1695492c2e658c0e3934c6318d23fb8a..5b08ec5b945af7e84834d4691c309d2d3dd1a84c 100644 --- a/scipy.spec +++ b/scipy.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %global blaslib flexiblas %global blasvar %{nil} %bcond_with doc @@ -7,9 +7,9 @@ Summary: Scientific Tools for Python Name: scipy -Version: 1.10.1 +Version: 1.11.3 Release: %{anolis_release}%{?dist} -License: BSD and Boost and Public Domain +License: BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 AND Boehm-GC AND Qhull AND LicenseRef-Fedora-Public-Domain Url: http://www.scipy.org/scipylib/index.html Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz @@ -22,6 +22,9 @@ BuildRequires: python3-devel, python3-numpy-f2py BuildRequires: python3-setuptools BuildRequires: python3-Cython BuildRequires: %{blaslib}-devel +BuildRequires: ninja-build +BuildRequires: python3-meson-python +BuildRequires: python3-pip %if %{with check} BuildRequires: fftw-devel, suitesparse-devel @@ -86,17 +89,20 @@ library_dirs = %{_libdir} EOF # Docs won't build unless the .dat files are specified here -sed -i 's/metadata = dict(/metadata = dict(package_data={"": ["*.dat"]},/' setup.py +sed -i 's/metadata = dict(/metadata = dict(package_data={"": ["*.dat"]},/' _setup.py -%build -export SCIPY_USE_PYTHRAN=0%{?with_pythran} -env CFLAGS="$RPM_OPT_FLAGS -lm" \ - FFLAGS="$RPM_OPT_FLAGS -fPIC -fallow-argument-mismatch" \ - LDFLAGS="%{__global_ldflags}" \ - %{_bindir}/python3 setup.py config_fc \ - --fcompiler=gnu95 --noarch \ - build +%if %{without pythran} +sed -i '/pythran/d' pyproject.toml +%endif +cat >> pyproject.toml << EOF + +[tool.meson-python.args] +setup = ['-Dblas=%{blaslib}%{blasvar}', '-Dlapack=%{blaslib}%{blasvar}'%{!?with_pythran:, '-Duse-pythran=false'}] +EOF + +%build +%pyproject_wheel %if %{with doc} pushd doc @@ -105,9 +111,9 @@ popd %endif %install -export SCIPY_USE_PYTHRAN=0%{?with_pythran} +%pyproject_install +%pyproject_save_files scipy -%py3_install # Some files got ambiguous python shebangs, we fix them after everything else is done %py3_shebang_fix %{buildroot}%{python3_sitearch} @@ -155,15 +161,21 @@ popd %files -n python3-scipy %license LICENSE.txt LICENSES_bundled.txt %{python3_sitearch}/scipy/ -%{python3_sitearch}/*.egg-info +%{python3_sitearch}/*.dist-info %files -n python3-scipy-doc -%doc PKG-INFO README.rst CONTRIBUTING.rst INSTALL.rst.txt +%doc PKG-INFO README.rst CONTRIBUTING.rst %if %{with doc} %doc doc/build-%{python3_version}/html %endif %changelog +* Fri Mar 21 2025 Bo Ren - 1.11.3 +- Update to 1.11.3 from 1.10.1 +- Use pyproject macros instead of the deprecated py3 macros +- Add BuildRequires for build issue +- Remove deleted doc file + * Wed Mar 13 2024 Zhao Hang - 1.10.1-2 - Rebuild with python3.11