From 0f8ef3afc2b06bd88b8b35c9d31f4cdc72bbbce8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 5 Nov 2015 17:15:44 +0100 Subject: [PATCH] Update to 3.2.7 --- .gitignore | 1 + eigen-3.2.3_suitesparse.patch | 33 --------------------------------- eigen3.spec | 14 +++++++------- sources | 2 +- 4 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 eigen-3.2.3_suitesparse.patch diff --git a/.gitignore b/.gitignore index 1d4a398..cc8563e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /eigen-3.2.4.tar.bz2 /eigen-3.2.5.tar.bz2 /eigen-3.2.6.tar.bz2 +/eigen-3.2.7.tar.bz2 diff --git a/eigen-3.2.3_suitesparse.patch b/eigen-3.2.3_suitesparse.patch deleted file mode 100644 index d36c854..0000000 --- a/eigen-3.2.3_suitesparse.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h ---- eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-16 18:30:52.000000000 +0100 -+++ eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-17 23:35:28.080925651 +0100 -@@ -78,7 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatri - { - res.itype = CHOLMOD_INT; - } -- else if (internal::is_same<_Index,UF_long>::value) -+ else if (internal::is_same<_Index,SuiteSparse_long>::value) - { - res.itype = CHOLMOD_LONG; - } -diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h ---- eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-16 18:30:52.000000000 +0100 -+++ eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-17 23:35:28.063925342 +0100 -@@ -47,7 +47,7 @@ namespace Eigen { - * You can then apply it to a vector. - * - * R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix. -- * NOTE : The Index type of R is always UF_long. You can get it with SPQR::Index -+ * NOTE : The Index type of R is always SuiteSparse_long. You can get it with SPQR::Index - * - * \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<> - * NOTE -@@ -59,7 +59,7 @@ class SPQR - public: - typedef typename _MatrixType::Scalar Scalar; - typedef typename _MatrixType::RealScalar RealScalar; -- typedef UF_long Index ; -+ typedef SuiteSparse_long Index ; - typedef SparseMatrix MatrixType; - typedef PermutationMatrix PermutationType; - public: diff --git a/eigen3.spec b/eigen3.spec index 8352c3a..96f0e72 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -4,10 +4,10 @@ # debuginfo package for the empty main package. %global debug_package %{nil} -%global commit c58038c56923 +%global commit b30b87236a1b Name: eigen3 -Version: 3.2.6 +Version: 3.2.7 Release: 1%{?dist} Summary: A lightweight C++ template library for vector and matrix math @@ -18,11 +18,9 @@ URL: http://eigen.tuxfamily.org/index.php?title=Main_Page # Renamed source file so it's not just a version number Source0: eigen-%{version}.tar.bz2 -# Fix build with recent suitesparse versions -Patch0: eigen-3.2.3_suitesparse.patch # Install FindEigen3.cmake # Adapted from Debian eigen3 package -Patch1: 01_install_FindEigen3.patch +Patch0: 01_install_FindEigen3.patch BuildRequires: atlas-devel BuildRequires: fftw-devel @@ -65,7 +63,6 @@ Developer documentation for Eigen. %prep %setup -q -n eigen-eigen-%{commit} %patch0 -p1 -%patch1 -p1 %build mkdir %{_target_platform} @@ -102,7 +99,10 @@ make -C %{_target_platform} %{?_smp_mflags} test ARGS="-V" || exit 0 %doc %{_target_platform}/doc/html %changelog -* Thu Oct 02 2015 Sandro Mani - 3.2.6-1 +* Thu Nov 05 2015 Sandro Mani - 3.2.7-1 +- Update to release 3.2.7 + +* Thu Oct 01 2015 Sandro Mani - 3.2.6-1 - Update to release 3.2.6 * Fri Aug 21 2015 Rich Mattes - 3.2.5-2 diff --git a/sources b/sources index 1cdc1c1..65d2681 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87274966745d2d3e7964fcc654d0a24b eigen-3.2.6.tar.bz2 +cc1bacbad97558b97da6b77c9644f184 eigen-3.2.7.tar.bz2