From f64e33e456d935e34f6202449cecb9eb00136436 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 28 Mar 2019 13:19:13 +0100 Subject: [PATCH] simpler rpath hack Version: 3.3.3-7 --- libarchive.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libarchive.spec b/libarchive.spec index 6f6894b..d0def88 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A library for handling streaming archive formats License: BSD @@ -82,12 +82,8 @@ standard output. %build -%configure --disable-static --disable-rpath -# remove rpaths -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - -make %{?_smp_mflags} +%configure --disable-static LT_SYS_LIBRARY_PATH=%_libdir +%make_build %install @@ -153,7 +149,7 @@ cat_logs () run_testsuite () { rc=0 - LD_LIBRARY_PATH=`pwd`/.libs make %{?_smp_mflags} check -j1 || { + %make_build check -j1 || { # error happened - try to extract in koji as much info as possible cat_logs @@ -219,6 +215,9 @@ run_testsuite %changelog +* Thu Mar 28 2019 Pavel Raiskup - 3.3.3-7 +- simplify libtool hacks + * Thu Mar 19 2019 Ondrej Dubaj - 3.3.3-6 - applied various flaws (#1663893)