Accepting request 791975 from home:bnavigator:branches:devel:languages:python:numeric

- Add scikit-build-pr450-findf2py.patch to find the flavor specific
  f2py
- see discussion on opensuse

OBS-URL: https://build.opensuse.org/request/show/791975
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=5

python-scikit-build.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  7 12:04:36 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Add scikit-build-pr450-findf2py.patch to find the flavor specific
+  f2py
+
 -------------------------------------------------------------------
 Tue Mar 10 10:33:57 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 

python-scikit-build.spec

@@ -25,6 +25,7 @@ License:        MIT
 URL:            https://github.com/scikit-build/scikit-build
 Source:         https://files.pythonhosted.org/packages/source/s/scikit-build/scikit-build-%{version}.tar.gz
 Patch0:         python38.patch
+Patch1:         scikit-build-pr450-findf2py.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools >= 28.0.0}
 BuildRequires:  fdupes
@@ -64,6 +65,7 @@ Improved build system generator for Python C/C++/Fortran/Cython extensions
 %prep
 %setup -q -n scikit-build-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %python_build

scikit-build-pr450-findf2py.patch

@@ -0,0 +1,27 @@
+From 3ab8fb174a13df1f7fe4c341518a51e7ed09b46a Mon Sep 17 00:00:00 2001
+From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
+Date: Tue, 24 Sep 2019 14:54:40 -0400
+Subject: [PATCH] FindF2PY: Ensure python version specific of f2py executable
+ is looked up first
+
+See #449
+
+Co-authored-by: Ben <code@bnavigator.de>
+---
+ (CHANGES.rst                            | 6 +++++-) removed from package
+ skbuild/resources/cmake/FindF2PY.cmake | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/skbuild/resources/cmake/FindF2PY.cmake b/skbuild/resources/cmake/FindF2PY.cmake
+index 0ab0fdbe..22d669c2 100644
+--- a/skbuild/resources/cmake/FindF2PY.cmake
++++ b/skbuild/resources/cmake/FindF2PY.cmake
+@@ -66,7 +66,7 @@
+ #   case, CMake is not used to find the compiler and configure the associated build system.
+ #
+ 
+-find_program(F2PY_EXECUTABLE NAMES f2py f2py${PYTHON_VERSION_MAJOR})
++find_program(F2PY_EXECUTABLE NAMES f2py${PYTHON_VERSION_MAJOR} f2py)
+ 
+ if(F2PY_EXECUTABLE)
+   # extract the version string