diff --git a/suitesparse.spec b/suitesparse.spec index dfc8924..8964c51 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,15 +1,3 @@ -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 -%bcond_without atlas310 -%else -%bcond_with atlas310 -%endif - -%if %{with atlas310} -%global atlaslibs -lsatlas -%else -%global atlaslibs -lcblas -llapack -%endif - %global amd_version 2.4.1 %global amd_version_major 2 %global btf_version 1.2.1 @@ -50,7 +38,7 @@ Name: suitesparse Version: 4.4.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -61,11 +49,7 @@ Source0: http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{vers BuildRequires: gcc BuildRequires: gcc-c++ -%if %{with atlas310} -BuildRequires: atlas-devel >= 3.10 -%else -BuildRequires: atlas-devel -%endif +BuildRequires: openblas-devel BuildRequires: tbb-devel BuildRequires: hardlink @@ -245,7 +229,7 @@ pushd CHOLMOD pushd ../Lib gcc -shared %{?__global_ldflags} -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \ libcholmod.so.%{cholmod_version} ../CHOLMOD/Lib/*.o \ - -L%{_libdir}/atlas %{atlaslibs} \ + -lopenblas \ libamd.so.%{amd_version_major} \ libcamd.so.%{camd_version_major} libcolamd.so.%{colamd_version_major} \ libccolamd.so.%{ccolamd_version_major} \ @@ -338,7 +322,7 @@ pushd UMFPACK pushd ../Lib gcc -shared %{?__global_ldflags} -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \ libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \ - -L%{_libdir}/atlas %{atlaslibs} \ + -lopenblas \ libamd.so.%{amd_version_major} \ libcholmod.so.%{cholmod_version_major} \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm @@ -357,7 +341,7 @@ pushd SPQR pushd ../Lib g++ -shared %{?__global_ldflags} -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \ - -L%{_libdir}/atlas -L%{_libdir} %{atlaslibs} \ + -lopenblas \ -ltbb \ libcholmod.so.%{cholmod_version_major} \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm @@ -435,6 +419,9 @@ hardlink -cv Docs/ Licenses/ %doc Doc/* %changelog +* Mon Jul 16 2018 Dominik Mierzejewski - 4.4.6-14 +- use openblas instead of atlas (#1506933) + * Sat Jul 14 2018 Fedora Release Engineering - 4.4.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild