From 3c97550c6009c0f3d593bdeb2c8ad13798e94a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Matos?= <jamatos@fedoraproject.org>
Date: Thu, 15 Jul 2021 09:28:08 +0100
Subject: [PATCH] update to 10.6.0 BR flexiblas for Fedora and lapack, openblas
 and atlas for EPEL adapt armadillo-devel accordingly

---
 .gitignore     |  3 +--
 armadillo.spec | 45 +++++++++++++++++++++++++++++----------------
 sources        |  2 +-
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb295de..7b3dcd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-clog
-/armadillo-10.5.3.tar.xz
+/armadillo-10.6.0.tar.xz
diff --git a/armadillo.spec b/armadillo.spec
index 7f1a8be..66dfb95 100644
--- a/armadillo.spec
+++ b/armadillo.spec
@@ -1,5 +1,5 @@
 Name:           armadillo
-Version:        10.5.3
+Version:        10.6.0
 Release:        1%{?dist}
 Summary:        Fast C++ matrix library with syntax similar to MATLAB and Octave
 
@@ -7,27 +7,27 @@ License:        ASL 2.0
 URL:            http://arma.sourceforge.net/
 Source:         http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.xz
 
-%if (0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 33))
-%undefine __cmake_in_source_build
-%endif
+BuildRequires:  gcc-c++
+BuildRequires:  cmake
+BuildRequires:  make
+BuildRequires:  arpack-devel
+BuildRequires:  hdf5-devel
+BuildRequires:  SuperLU-devel
 
-%if 0%{?fedora} > 32
+# flexiblas is only available on Fedora, for EPEL replace it by atlas, lapack and openblas
+%if %{?fedora}
 %global extra_options -DALLOW_FLEXIBLAS_LINUX=ON
 BuildRequires:  flexiblas-devel
 %else
+%undefine __cmake_in_source_build
 %global extra_options %{nil}
-%endif
-
-BuildRequires:  gcc-c++
-BuildRequires:  cmake, make
-BuildRequires:  lapack-devel, arpack-devel
-BuildRequires:  hdf5-devel
+BuildRequires:  atlas-devel
+BuildRequires:  lapack-devel
 %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
 %ifarch %{openblas_arches}
 BuildRequires:  openblas-devel
 %endif
-BuildRequires:  SuperLU-devel atlas-devel
-
+%endif
 
 %description
 Armadillo is a C++ linear algebra library (matrix maths)
@@ -48,12 +48,20 @@ 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, libstdc++-devel
+Requires:       libstdc++-devel
+Requires:       arpack-devel
 Requires:       hdf5-devel
+Requires:       SuperLU-devel
+
+%if %{?fedora}
+Requires:  flexiblas-devel
+%else
+Requires:  atlas-devel
+Requires:  lapack-devel
 %ifarch %{openblas_arches}
-Requires:       openblas-devel
+Requires:  openblas-devel
+%endif
 %endif
-Requires:       SuperLU-devel atlas-devel
 
 
 %description devel
@@ -115,6 +123,11 @@ make -C "%{_vpath_builddir}"
 
 
 %changelog
+* Thu Jul 15 2021 José Matos <jamatos@fedoraproject.org> - 10.6.0-1
+- update to 10.6.0
+- BR flexiblas for Fedora and lapack, openblas and atlas for EPEL
+- adapt armadillo-devel accordingly
+
 * Wed Jul  7 2021 José Matos <jamatos@fedoraproject.org> - 10.5.3-1
 - update to 10.5.3
 
diff --git a/sources b/sources
index 1ac3407..fa3f802 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (armadillo-10.5.3.tar.xz) = b5bc776135548e786731fe1503618b8db4d89682ff308deddb78a81f83d1f1bef39efc982d3b91be98f0575c827eba80b92ad1419d9c0ebbc60878f5834f06db
+SHA512 (armadillo-10.6.0.tar.xz) = f3c542cdddfa59a9d96a5e91215d76cc4c53c6557664145a82bd74ff846328146d3c6633ab0cbd544525c5b6f3d518a679aa62822f5d7da101dcafd97c0321ce