]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
xz: Make package work on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Dec 2011 17:12:35 +0000 (18:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Dec 2011 17:12:35 +0000 (18:12 +0100)
xz/xz.nm

index 75711a0e3e51435b75834045299a76d7e70f8c4d..16ed2cde33ba49f4c0c01de7cc9e9ab074bba5f0 100644 (file)
--- 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