From b1a494a741c1c894eb3296e59accc346027360c2 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Jul 28 2020 23:33:33 +0000 Subject: Fix SuiteSparse support (again) - Drop lapack-devel now that FindLAPACK supports BLAS correctly - Drop BLAS_LIBRARIES var when not using ATLAS --- diff --git a/ceres-solver.spec b/ceres-solver.spec index 4047cb0..c657a27 100644 --- a/ceres-solver.spec +++ b/ceres-solver.spec @@ -3,7 +3,7 @@ Version: 1.14.0 # Release candidate versions are messy. Give them a release of # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0 # URL). Non-RC releases go back to incrementing integers starting at 1. -Release: 4%{?dist} +Release: 5%{?dist} Summary: A non-linear least squares minimizer License: BSD @@ -35,7 +35,6 @@ BuildRequires: eigen3-static >= 3.2.1 # suitesparse < 3.4.0-9 ships without *.hpp C++ headers # https://bugzilla.redhat.com/show_bug.cgi?id=1001869 BuildRequires: suitesparse-devel >= 3.4.0-9 -BuildRequires: lapack-devel # If the suitesparse package was built with TBB then we need TBB too BuildRequires: tbb-devel @@ -100,7 +99,9 @@ developing applications that use %{name}. %build %cmake \ -DCXSPARSE_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \ +%ifnarch %{openblas_arches} -DBLAS_LIBRARIES:PATH=%{_libdir}/atlas/libsatlas.so \ +%endif -DGFLAGS_INCLUDE_DIR=%{_includedir} %cmake_build @@ -132,6 +133,10 @@ CTEST_OUTPUT_ON_FAILURE=1 %ctest %changelog +* Tue Jul 28 2020 Scott K Logan - 1.14.0-5 +- Drop lapack-devel now that FindLAPACK supports BLAS correctly +- Drop BLAS_LIBRARIES var when not using ATLAS + * Mon Jul 27 2020 Fedora Release Engineering - 1.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild