[diffmark] Revert "0.09 has libtool recent enough not to reinject --rpath"
Petr Pisar
ppisar at fedoraproject.org
Tue Nov 15 12:28:04 UTC 2011
commit 181414ac3fa7a1344c0981ba2ee09c63f9dc51de
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Nov 15 13:27:19 2011 +0100
Revert "0.09 has libtool recent enough not to reinject --rpath"
This is not true in Koji environment somehow.
This reverts commit 321a4b08d874684b7d73b86eee2067608cdea78b.
diffmark-0.09-remove_rpath.patch | 2 ++
diffmark.spec | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/diffmark-0.09-remove_rpath.patch b/diffmark-0.09-remove_rpath.patch
index 75e1126..1c7b0bc 100644
--- a/diffmark-0.09-remove_rpath.patch
+++ b/diffmark-0.09-remove_rpath.patch
@@ -1,5 +1,7 @@
Remove RPATH
+Then libtoolize -f && autoreconf to get rid of RPATH in libtool.
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 951a1c5..6f53a59 100644
--- a/lib/Makefile.am
diff --git a/diffmark.spec b/diffmark.spec
index 8f817ad..9b94f71 100644
--- a/diffmark.spec
+++ b/diffmark.spec
@@ -13,7 +13,7 @@ Source0: %{url}%{name}-%{version}.tar.gz
Patch0: %{name}-0.09-remove_rpath.patch
BuildRequires: libxml2-devel
# Because of diffmark-0.08-remove_rpath.patch:
-BuildRequires: autoconf, automake
+BuildRequires: autoconf, automake, libtool
%description
This is a XML diff and merge package. It consists of a shared library and
@@ -30,7 +30,7 @@ Header files and libraries for developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .rpath
-autoreconf
+libtoolize --force && autoreconf
%build
%configure --disable-static
More information about the scm-commits
mailing list