From 618c228666bf59ff66b0dee229ef27426a70b39e04e6c716f6da8ab21c6c7750 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 9 Nov 2020 11:34:15 +0000 Subject: [PATCH] Accepting request 845987 from home:badshah400:boo1178139 - Drop eigen_pkgconfig.patch: the includedir now needs to be specified relative to CMAKE_INSTALL_PREFIX, so this patch causes the includedir in the pkgconfig file to be erroneousi (boo#1178139). - Use %autosetup to automatically run through patches. OBS-URL: https://build.opensuse.org/request/show/845987 OBS-URL: https://build.opensuse.org/package/show/science/eigen3?expand=0&rev=35 --- eigen3.changes | 9 +++++++++ eigen3.spec | 11 +---------- eigen_pkgconfig.patch | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 eigen_pkgconfig.patch diff --git a/eigen3.changes b/eigen3.changes index fbc6315..e55d320 100644 --- a/eigen3.changes +++ b/eigen3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 4 13:27:10 UTC 2020 - Atri Bhattacharya + +- Drop eigen_pkgconfig.patch: the includedir now needs to be + specified relative to CMAKE_INSTALL_PREFIX, so this patch causes + the includedir in the pkgconfig file to be erroneousi + (boo#1178139). +- Use %autosetup to automatically run through patches. + ------------------------------------------------------------------- Sun Oct 25 21:45:11 UTC 2020 - Stefan Brüns diff --git a/eigen3.spec b/eigen3.spec index 19d2c4e..44adaf1 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -35,8 +35,6 @@ URL: http://eigen.tuxfamily.org/ Source0: https://gitlab.com/libeigen/eigen/-/archive/%{version}/%{srcname}-%{version}.tar.bz2 Patch0: 0001-Disable-Altivec-for-ppc64le.patch Patch1: 0001-Do-stack-allignment-on-ppc.patch -# PATCH-FIX-OPENSUSE eigen_pkgconfig.patch asterios.dramis@gmail.com -- Fix pkg-config file includedir -Patch2: eigen_pkgconfig.patch # PATCH-FIX-OPENSUSE 01_install_FindEigen3.patch asterios.dramis@gmail.com -- Install FindEigen3.cmake Patch3: 01_install_FindEigen3.patch # PATCH-FIX-OPENSUSE eigen3-3.3.1-fixcmake.patch -- Fix double {prefix} as we use INCLUDE_INSTALL_DIR with {_includedir} @@ -98,14 +96,7 @@ for Linear Algebra %endif %prep -%setup -q -n %{srcname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%autosetup -p1 -n %{srcname}-%{version} # Fix rpmlint warning "wrong-file-end-of-line-encoding" sed -i 's/\r$//' COPYING.MINPACK diff --git a/eigen_pkgconfig.patch b/eigen_pkgconfig.patch deleted file mode 100644 index 843cd6d..0000000 --- a/eigen_pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: eigen-3.3.8/eigen3.pc.in -=================================================================== ---- eigen-3.3.8.orig/eigen3.pc.in -+++ eigen-3.3.8/eigen3.pc.in -@@ -6,4 +6,4 @@ Description: A C++ template library for - Requires: - Version: @EIGEN_VERSION_NUMBER@ - Libs: --Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ -+Cflags: -I@INCLUDE_INSTALL_DIR@