From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Dec 2011 17:12:35 +0000 (+0100)
Subject: xz: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc2d41d601fa28ae756f1df471b9bd1dd8f0e91e;p=ipfire-3.x.git

xz: Make package work on x86_64.
---

diff --git a/xz/xz.nm b/xz/xz.nm
index 75711a0e3..16ed2cde3 100644
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -5,7 +5,7 @@
 
 name       = xz
 version    = 5.0.3
-release    = 6
+release    = 7
 
 compat_version = 4.999.9beta
 
@@ -26,10 +26,13 @@ source_dl  = http://tukaani.org/xz/
 sources    = %{thisapp}.tar.xz %{name}-%{compat_version}.tar.xz
 
 build
+	configure_options += --disable-rpath
+
 	build_cmds
 		# Build compat version of library.
 		cd %{DIR_SRC}/%{name}-%{compat_version}
 		./configure %{configure_options}
+		%{MACRO_FIX_LIBTOOL}
 		make %{PARALLELISMFLAGS}
 	end
 
@@ -41,7 +44,7 @@ build
 	install_cmds
 		# Install comapt version of library.
 		cd %{DIR_SRC}/%{name}-%{compat_version}
-		cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}/usr/lib
+		cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir}
 	end
 end
 
@@ -81,7 +84,7 @@ packages
 		summary = Compatibility version of %{name} (%{compat_version}).
 
 		files
-			/usr/lib/lib*.so.0*
+			%{libdir}/lib*.so.0*
 		end
 	end