diff --git a/python-cmapfile.changes b/python-cmapfile.changes index 36bc0aa..da47a1c 100644 --- a/python-cmapfile.changes +++ b/python-cmapfile.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 17 07:22:57 UTC 2024 - Ben Greiner + +- Revert. Works fine with numpy2. The pinning creates too many + conflicts in consumers + ------------------------------------------------------------------- Wed Jul 17 02:13:38 UTC 2024 - Steve Kowalik diff --git a/python-cmapfile.spec b/python-cmapfile.spec index 1005e24..0134ee1 100644 --- a/python-cmapfile.spec +++ b/python-cmapfile.spec @@ -27,7 +27,7 @@ URL: https://github.com/cgohlke/cmapfile/ Source: https://github.com/cgohlke/cmapfile/archive/v%{version}.tar.gz#/cmapfile-%{version}.tar.gz BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module h5py >= 3.1} -BuildRequires: %{python_module numpy >= 1.22 with %python-numpy < 2} +BuildRequires: %{python_module numpy >= 1.22} BuildRequires: %{python_module oiffile >= 2021.6.6} BuildRequires: %{python_module pip} BuildRequires: %{python_module scipy >= 1.5} @@ -37,10 +37,10 @@ BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-h5py >= 3.1 +Requires: python-numpy >= 1.22 Requires: python-oiffile >= 2021.6.6 Requires: python-scipy >= 1.5 Requires: python-tifffile >= 2021.11.2 -Requires: (python-numpy >= 1.22 with python-numpy < 2) Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch