diff --git a/mp.spec b/mp.spec index dd66379..b55ff80 100644 --- a/mp.spec +++ b/mp.spec @@ -16,6 +16,12 @@ %endif %endif +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + %if 0%{?rhel} && 0%{?rhel} < 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif @@ -30,7 +36,7 @@ Name: mp Version: 3.1.0 -Release: 30.%{date}git%{shortcommit}%{?dist} +Release: 31.%{date}git%{shortcommit}%{?dist} License: MIT and BSD Summary: An open-source library for mathematical programming URL: https://github.com/ampl/mp @@ -83,7 +89,7 @@ BuildRequires: git-core BuildRequires: jacop BuildRequires: java-devel %endif -BuildRequires: openblas-devel +BuildRequires: %{blaslib}-devel BuildRequires: pkgconfig(gsl) %if 0%{?fedora} BuildRequires: pkgconfig(odbc) @@ -183,12 +189,7 @@ sed -i 's,returncode == 0,False,' support/build-docs.py %endif %build -%if 0%{?fedora} || 0%{?rhel} >= 7 -export LIBS="-lgsl -lopenblas" -%else -export LIBS="-lgsl -L%{_libdir}/atlas -lcblas -latlas" -%endif - +export LIBS="-lgsl -l%{blaslib}" mkdir -p build && pushd build BUILD="asl,gsl,smpswriter" %if 0%{?with_gecode} @@ -380,6 +381,9 @@ ctest --force-new-ctest-process -j1 %endif %changelog +* Thu Aug 27 2020 Iñaki Úcar - 3.1.0-31.20200303git7fd4828 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Sat Aug 01 2020 Fedora Release Engineering - 3.1.0-30.20200303git7fd4828 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild