From db7eca4c544cc554f9c6abb95ff9dc71fc022ef2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 28 Feb 2016 12:01:36 +0100 Subject: [PATCH] - updated to 3.2.8 - removed obsolete pkgconfig patch, pass relative include dir to generate proper .pc file --- eigen3.spec | 16 ++++++++-------- pkgconfig.patch | 8 -------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 pkgconfig.patch diff --git a/eigen3.spec b/eigen3.spec index cdcce1c..2eebbf2 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -6,17 +6,16 @@ Summary: C++ template library for linear algebra Summary(pl.UTF-8): Biblioteka szablonów C++ do algebry liniowej Name: eigen3 -Version: 3.2.7 -Release: 2 +Version: 3.2.8 +Release: 1 License: LGPL v3+ or GPL v2+ Group: Development/Libraries #Source0Download: http://eigen.tuxfamily.org/index.php?title=Main_Page Source0: https://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2 -# Source0-md5: cc1bacbad97558b97da6b77c9644f184 +# Source0-md5: 9e3bfaaab3db18253cfd87ea697b3ab1 Patch0: %{name}-buildtype.patch -Patch1: pkgconfig.patch URL: http://eigen.tuxfamily.org/ -BuildRequires: cmake >= 2.8.2 +BuildRequires: cmake >= 2.8.5 %{?with_gdb:BuildRequires: python-modules} BuildRequires: rpmbuild(macros) >= 1.605 Requires: libstdc++-devel @@ -84,16 +83,17 @@ end do pliku ~/.gdbinit . %prep -%setup -q -n eigen-eigen-b30b87236a1b +%setup -q -n eigen-eigen-07105f7124f9 %patch0 -p1 -%patch1 -p1 %build install -d build cd build +# CMakeLists.txt requires CMAKE_INSTALL_INCLUDEDIR to be relative (for proper .pc file generation) %cmake .. \ -DCMAKE_CXX_COMPILER_WORKS=1 \ - -DCMAKE_CXX_COMPILER="%{__cxx}" + -DCMAKE_CXX_COMPILER="%{__cxx}" \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=include %{__make} diff --git a/pkgconfig.patch b/pkgconfig.patch deleted file mode 100644 index aa0fd89..0000000 --- a/pkgconfig.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- eigen-eigen-b30b87236a1b/eigen3.pc.in~ 2015-11-05 15:56:09.000000000 +0100 -+++ eigen-eigen-b30b87236a1b/eigen3.pc.in 2015-11-23 19:27:52.734187104 +0100 -@@ -3,4 +3,4 @@ - Requires: - Version: ${EIGEN_VERSION_NUMBER} - Libs: --Cflags: -I${INCLUDE_INSTALL_DIR} -+Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} -- 2.44.0