diff --git a/.gitignore b/.gitignore index cc8563e..f22602e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /eigen-3.2.5.tar.bz2 /eigen-3.2.6.tar.bz2 /eigen-3.2.7.tar.bz2 +/eigen-3.2.8.tar.bz2 diff --git a/01_install_FindEigen3.patch b/01_install_FindEigen3.patch index 747edf4..eb7c738 100644 --- a/01_install_FindEigen3.patch +++ b/01_install_FindEigen3.patch @@ -1,12 +1,7 @@ -Description: install FindEigen3.cmake into usr/share/cmake-2.8/Modules -Author: Anton Gladky -Last-Update: 2013-11-09 - -Index: eigen-eigen-1306d75b4a21/CMakeLists.txt -=================================================================== ---- eigen-eigen-1306d75b4a21.orig/CMakeLists.txt -+++ eigen-eigen-1306d75b4a21/CMakeLists.txt -@@ -323,6 +323,11 @@ install(FILES +diff -rupN eigen-eigen-07105f7124f9/CMakeLists.txt eigen-eigen-07105f7124f9-new/CMakeLists.txt +--- eigen-eigen-07105f7124f9/CMakeLists.txt 2016-02-16 14:26:15.000000000 +0100 ++++ eigen-eigen-07105f7124f9-new/CMakeLists.txt 2016-02-17 09:44:43.556543936 +0100 +@@ -324,6 +324,11 @@ install(FILES DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) @@ -16,5 +11,5 @@ Index: eigen-eigen-1306d75b4a21/CMakeLists.txt + ) + if(EIGEN_BUILD_PKGCONFIG) - SET(path_separator ":") - STRING(REPLACE ${path_separator} ";" pkg_config_libdir_search "$ENV{PKG_CONFIG_LIBDIR}") + configure_file(eigen3.pc.in eigen3.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc diff --git a/eigen3.spec b/eigen3.spec index 348e7b1..1e805b9 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -4,11 +4,11 @@ # debuginfo package for the empty main package. %global debug_package %{nil} -%global commit b30b87236a1b +%global commit 07105f7124f9 Name: eigen3 -Version: 3.2.7 -Release: 4%{?dist} +Version: 3.2.8 +Release: 1%{?dist} Summary: A lightweight C++ template library for vector and matrix math Group: Development/Libraries @@ -22,10 +22,6 @@ Source0: eigen-%{version}.tar.bz2 # Adapted from Debian eigen3 package Patch0: 01_install_FindEigen3.patch -# Fix incorrect include path in pkgconfig file -# See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1100#c2 -Patch1: eigen_pkgconfig.patch - BuildRequires: atlas-devel BuildRequires: fftw-devel BuildRequires: glew-devel @@ -37,6 +33,8 @@ BuildRequires: suitesparse-devel BuildRequires: gcc-gfortran BuildRequires: SuperLU-devel BuildRequires: qt-devel +BuildRequires: scotch-devel +BuildRequires: metis-devel BuildRequires: cmake BuildRequires: doxygen @@ -67,7 +65,6 @@ Developer documentation for Eigen. %prep %setup -q -n eigen-eigen-%{commit} %patch0 -p1 -%patch1 -p1 %build mkdir %{_target_platform} @@ -77,7 +74,11 @@ pushd %{_target_platform} # https://bugzilla.redhat.com/show_bug.cgi?id=1063999 export CXXFLAGS="%{optflags} -mno-vsx" %endif -%cmake .. -DBLAS_LIBRARIES="cblas" -DSUPERLU_INCLUDES=%{_includedir}/SuperLU +%cmake .. -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 \ + -DBLAS_LIBRARIES="cblas" \ + -DSUPERLU_INCLUDES=%{_includedir}/SuperLU \ + -DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch" \ + -DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis" popd make -C %{_target_platform} %{?_smp_mflags} make doc -C %{_target_platform} %{?_smp_mflags} @@ -104,6 +105,9 @@ rm -f %{_target_platform}/doc/html/unsupported/installdox %doc %{_target_platform}/doc/html %changelog +* Sat Feb 20 2016 Sandro Mani - 3.2.8-1 +- Update to 3.2.8 + * Wed Feb 03 2016 Fedora Release Engineering - 3.2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 65d2681..c0ffe19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc1bacbad97558b97da6b77c9644f184 eigen-3.2.7.tar.bz2 +9e3bfaaab3db18253cfd87ea697b3ab1 eigen-3.2.8.tar.bz2