diff --git a/ncl.spec b/ncl.spec index d7ef28c..e1d265c 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,15 @@ +%if 0%{?fedora} >= 33 +%bcond_without flexiblas +%endif +%if %{with flexiblas} +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + Name: ncl Version: 6.6.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: NCAR Command Language and NCAR Graphics License: BSD @@ -73,7 +82,7 @@ BuildRequires: byacc, flex %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: flex-static %endif -BuildRequires: openblas-devel +BuildRequires: %{blaslib}-devel BuildRequires: udunits2-devel Requires: %{name}-common = %{version}-%{release} Requires: udunits2 @@ -140,8 +149,8 @@ Example programs and data using NCL. %patch13 -p1 -b .includes %patch16 -p1 -b .secondary -sed -ri -e 's,-lblas_ncl,-lopenblas,' \ - -e 's,-llapack_ncl,-lopenblas,' config/Project +sed -ri -e 's,-lblas_ncl,-l%{blaslib},' \ + -e 's,-llapack_ncl,-l%{blaslib},' config/Project #Spurrious exec permissions find -name '*.[fh]' -exec chmod -x {} + @@ -356,6 +365,9 @@ done %changelog +* Fri Aug 14 2020 Iñaki Úcar - 6.6.2-14 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Tue Jul 28 2020 Fedora Release Engineering - 6.6.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild