From 06f6ef42a1ce4b6e28258bd0f9fd6f3502f56fb4 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Mon, 18 May 2009 17:16:28 +0000 Subject: [PATCH] - Use included libtool, kill rpath a different way (#225988) --- libavc1394.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavc1394.spec b/libavc1394.spec index 74c98a3..93892ad 100644 --- a/libavc1394.spec +++ b/libavc1394.spec @@ -1,14 +1,13 @@ Summary: Audio/Video Control library for IEEE-1394 devices Name: libavc1394 Version: 0.5.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libavc1394/ Source: http://downloads.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz Patch1: libavc1394-0.5.1-librom.patch BuildRequires: libraw1394-devel -BuildRequires: autoconf automake libtool BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ExcludeArch: s390 s390x @@ -32,9 +31,9 @@ Development libraries required to build applications using libavc1394. chmod -x test/dvcont.c %build -# Rerun autotools to pick up newer libtool w/o hard-coded rpaths -autoreconf -f -i %configure +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} %install @@ -74,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 18 2009 Jarod Wilson 0.5.3-7 +- Use included libtool, kill rpath a different way (#225988) + * Mon May 18 2009 Jarod Wilson 0.5.3-6 - Fix up merge review issues (#225988)