diff --git a/.gitignore b/.gitignore index 1a546b6..fa706cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ clog -/armadillo-6.600.4.tar.gz +/armadillo-6.700.4.tar.gz diff --git a/armadillo.spec b/armadillo.spec index d1b8d4b..9765ac6 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,6 +1,6 @@ Name: armadillo -Version: 6.600.4 -Release: 3%{?dist} +Version: 6.700.4 +Release: 1%{?dist} Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS Group: Development/Libraries @@ -9,7 +9,11 @@ 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 +%if 0%{?fedora} > 23 BuildRequires: SuperLU43-devel +%else +BuildRequires: SuperLU-devel +%endif %description Armadillo is a C++ linear algebra library (matrix maths) @@ -32,7 +36,12 @@ 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: SuperLU43-devel +%if 0%{?fedora} > 23 +BuildRequires: SuperLU43-devel +%else +BuildRequires: SuperLU-devel +%endif + %description devel This package contains files necessary for development using the @@ -43,9 +52,11 @@ and user documentation (API reference guide). %prep %setup -q +%if 0%{?fedora} > 23 # 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 +%endif # convert DOS end-of-line to UNIX end-of-line @@ -94,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT %doc mex_interface %changelog +* Fri Apr 15 2016 José Matos - 6.700.4-1 +- update to 6.700.4 +- superlu43 is only required for Fedora >= 24 + * Tue Mar 29 2016 Mukundan Ragavan - 6.600.4-3 - Add SuperLU43 (compat package) as dep - Fix cmake files for building against SuperLU43 diff --git a/sources b/sources index c0191df..0c9e5eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdd3a34aa9a350a2add53329118cb415 armadillo-6.600.4.tar.gz +6501339e92ef706f787e6d0927d49645 armadillo-6.700.4.tar.gz