From ed1c8fdb910d7edab1c071dccb5adb43ec4858b3 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Thu, 30 Nov 2017 22:52:15 -0500 Subject: [PATCH] Update to latest stable version. --- armadillo.spec | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/armadillo.spec b/armadillo.spec index cb4b273..ac3e0e7 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,18 +1,27 @@ Name: armadillo -Version: 8.100.1 -Release: 2%{?dist} +Version: 8.300.0 +Release: 1%{?dist} Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave License: ASL 2.0 URL: http://arma.sourceforge.net/ Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.xz -BuildRequires: cmake, lapack-devel, arpack-devel, hdf5-devel +%if 0%{?rhel} && 0%{?rhel} < 7 +%define old_epel 1 +%else +%define old_epel 0 +%endif + +BuildRequires: cmake, lapack-devel, arpack-devel +%if %{old_epel} == 0 +BuildRequires: hdf5-devel +%endif %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %ifarch %{openblas_arches} BuildRequires: openblas-devel %endif -BuildRequires: SuperLU-devel +BuildRequires: SuperLU-devel atlas-devel %description @@ -34,11 +43,14 @@ than another language like Matlab or Octave. %package devel Summary: Development headers and documentation for the Armadillo C++ library Requires: %{name} = %{version}-%{release} -Requires: lapack-devel, arpack-devel, hdf5-devel, libstdc++-devel +Requires: lapack-devel, arpack-devel, libstdc++-devel +%if %{old_epel} == 0 +Requires: hdf5-devel +%endif %ifarch %{openblas_arches} Requires: openblas-devel %endif -Requires: SuperLU-devel +Requires: SuperLU-devel atlas-devel %description devel @@ -59,7 +71,11 @@ for file in README.txt; do done %build +%if %{old_epel} == 1 +%{cmake} -DDETECT_HDF5=OFF . +%else %{cmake} +%endif %{__make} VERBOSE=1 %{?_smp_mflags} @@ -94,9 +110,15 @@ rm -rf examples/lib_win64 %doc mex_interface %changelog +* Thu Nov 30 2017 Ryan Curtin - 8.300.0-1 +- Update Armadillo to 8.300.0. + * Sun Sep 17 2017 Rex Dieter - 8.100.1-2 - tighten %%files to track library soname +* Thu Oct 26 2017 Ryan Curtin - 8.200.1-1 +- Update Armadillo to 8.200.1. + * Wed Sep 13 2017 Ryan Curtin - 8.100.1-1 - Update Armadillo to 8.100.1.