From 36095c37bf36c88f133a4e1495f3e11cc45484b4 Mon Sep 17 00:00:00 2001
From: Iñaki Úcar <iucar@fedoraproject.org>
Date: Aug 21 2020 09:55:15 +0000
Subject: https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager


---

diff --git a/bout++.spec b/bout++.spec
index f91d8e5..7446c55 100644
--- a/bout++.spec
+++ b/bout++.spec
@@ -1,6 +1,6 @@
 Name:           bout++
 Version:        4.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Library for the BOUndary Turbulence simulation framework
 
 # BOUT++ itself is LGPL, but we are linking with GPLed code, so the distributed library is GPL
@@ -12,14 +12,9 @@ Source0:        https://github.com/boutproject/BOUT-dev/releases/download/v%{ver
 Patch0:  remove-mpark.patch
 
 %if 0%{?fedora} >= 33
-%global blaslib flexiblas
-%global blasvar %{nil}
-%else
-%global blaslib openblas
-%global blasvar p
+%bcond_without flexiblas
 %endif
 
-
 # Disable tests and manual on epel < 8
 %if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_with manual
@@ -72,8 +67,11 @@ BuildRequires:  python%{python3_pkgversion}-numpy
 BuildRequires:  python%{python3_pkgversion}-Cython
 BuildRequires:  python%{python3_pkgversion}-netcdf4
 BuildRequires:  python%{python3_pkgversion}-scipy
-BuildRequires:  %{blaslib}-devel
-BuildRequires:  lapack-devel
+%if %{with flexiblas}
+BuildRequires:  flexiblas-devel
+%else
+BuildRequires:  blas-devel, lapack-devel
+%endif
 BuildRequires:  gcc-c++
 %if %{with system_mpark}
 BuildRequires:  mpark-variant-devel
@@ -328,6 +326,12 @@ do
       exit 1
   fi
 
+  %if %{with flexiblas}
+  sed -e 's|-lblas|-lflexiblas|g' \
+      -e 's|-llapack|-lflexiblas|g' \
+      -i configure
+  %endif
+
   %configure \
 	     --with-netcdf \
              --with-hdf5 \
@@ -346,7 +350,6 @@ do
 
   sed -e "s| -L%{_libdir} | |g" \
       -e 's|@$(LD)|$(LD)|'  \
-      -e 's| -lblas | -l%{blaslib} |g' \
       -i make.config
   cat make.config
 
@@ -526,6 +529,9 @@ done
 #
 
 %changelog
+* Thu Aug 20 2020 Iñaki Úcar <iucar@fedoraproject.org> - 4.3.1-7
+- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
+
 * Sat Aug 15 2020 David Schwörer <davidsch@fedoraproject.org> 4.3.1-6
 - Enable sundials and petsc
 - Rebuild with flexiblas