From 589024d3d0dc3934c6ca2fff805019baa4b25b8eb2a0ce2cc7c1067f83c50894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 23 Sep 2020 08:44:21 +0000 Subject: [PATCH] Accepting request 836166 from home:StefanBruens:branches:devel:languages:python:numeric - Fix upgrade from older distro versions which did not package f2py using update-alternatives (catched by openQA, boo#1176832). OBS-URL: https://build.opensuse.org/request/show/836166 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=74 --- python-numpy.changes | 6 ++++++ python-numpy.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/python-numpy.changes b/python-numpy.changes index 73ecd01..a056c19 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 22 16:40:40 UTC 2020 - Stefan Brüns + +- Fix upgrade from older distro versions which did not package + f2py using update-alternatives (catched by openQA, boo#1176832). + ------------------------------------------------------------------- Fri Sep 18 08:19:50 UTC 2020 - Egbert Eich diff --git a/python-numpy.spec b/python-numpy.spec index 0817243..a63a6bf 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -103,6 +103,10 @@ BuildRequires: openblas-devel > 0.3.4 BuildRequires: blas-devel BuildRequires: lapack-devel %endif +# Last version which packaged %%{_bindir}/f2py without update-alternatives +# Protect it from substitution +%define oldpy_numpy python-numpy +Conflicts: %{oldpy_numpy} <= 1.12.0 %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel