From 9c75d271861923c267bccf7a7d0f569fd99ba679 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 30 Nov 2017 21:06:41 -0500 Subject: [PATCH] Fix lib linking in EPEL (added conditionals; Thanks Antonio Trande)) Use license macro --- SuperLU.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/SuperLU.spec b/SuperLU.spec index e7cdcdd..b728a5f 100644 --- a/SuperLU.spec +++ b/SuperLU.spec @@ -1,9 +1,14 @@ %global genname superlu %global libver 5.1 +## The RPM macro for the linker flags does not exist on EPEL +%if 0%{?rhel} < 7 +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +%endif + Name: SuperLU Version: 5.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Subroutines to solve sparse linear systems %{?el5:Group: System/Libraries} @@ -68,10 +73,10 @@ sed -i -e "s|-O3|$RPM_OPT_FLAGS|" \ -e "s|\$(HOME)/Dropbox/Codes/%{name}/%{name}|%{_builddir}/%{name}_%{version}|" \ -e 's!lib/libsuperlu_5.1.a$!SRC/libsuperlu.so!' \ -e 's!-shared!& %{__global_ldflags}!' \ -%if 0%{?fedora} >= 21 - -e "s|-L/usr/lib -lblas|-L%{_libdir}/atlas -lsatlas|" \ -%else +%if 0%{?rhel} && 0%{?rhel} < 7 -e "s|-L/usr/lib -lblas|-L%{_libdir}/atlas -lf77blas|" \ +%else + -e "s|-L/usr/lib -lblas|-L%{_libdir}/atlas -lsatlas|" \ %endif make.inc @@ -106,6 +111,7 @@ popd %files %doc README +%license License.txt %{_libdir}/libsuperlu.so.%{libver} %files devel @@ -116,6 +122,10 @@ popd %doc DOC EXAMPLE FORTRAN %changelog +* Sat Oct 21 2017 Mukundan Ragavan - 5.2.0-5 +- Fix lib linking in EPEL (added conditionals; Thanks Antonio Trande)) +- Use license macro + * Wed Aug 02 2017 Fedora Release Engineering - 5.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild