From 6d482eea505881a827f0f12ca7a1e98b24f2cc9d Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 29 Mar 2016 18:11:13 -0400 Subject: [PATCH] Add SuperLU43 (compat package) as dep - Fix cmake files for building against SuperLU43 --- armadillo.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/armadillo.spec b/armadillo.spec index d802b3e..d1b8d4b 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,6 +1,6 @@ Name: armadillo Version: 6.600.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS Group: Development/Libraries @@ -9,7 +9,7 @@ URL: http://arma.sourceforge.net/ Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake, blas-devel, lapack-devel, atlas-devel, arpack-devel, hdf5-devel -BuildRequires: SuperLU-devel +BuildRequires: SuperLU43-devel %description Armadillo is a C++ linear algebra library (matrix maths) @@ -32,7 +32,7 @@ Summary: Development headers and documentation for the Armadillo C++ libr Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: blas-devel, lapack-devel, atlas-devel, arpack-devel, hdf5-devel, libstdc++-devel -Requires: SuperLU-devel +Requires: SuperLU43-devel %description devel This package contains files necessary for development using the @@ -43,6 +43,10 @@ and user documentation (API reference guide). %prep %setup -q +# fix for building using SuperLU43 +sed -i 's/\/usr\/include\/SuperLU\//\/usr\/include\/SuperLU43\//' cmake_aux/Modules/ARMA_FindSuperLU.cmake +sed -i 's/NAMES superlu/NAMES superlu43/' cmake_aux/Modules/ARMA_FindSuperLU.cmake + # convert DOS end-of-line to UNIX end-of-line for file in README.txt; do @@ -90,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT %doc mex_interface %changelog +* Tue Mar 29 2016 Mukundan Ragavan - 6.600.4-3 +- Add SuperLU43 (compat package) as dep +- Fix cmake files for building against SuperLU43 + * Sat Mar 26 2016 Mukundan Ragavan - 6.600.4-2 - Rebuild for SuperLU soname bump (libsuperlu.so.5.1)