xfsprogs: Make package work on x86_64.

diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index 51e2d736abc47a0d0a45f5496d33917d8233ada5..b8ee34e04fe91e5872a0b9aca8774d29c1b68ed6 100644 (file)
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = xfsprogs
-version    = 3.1.2
+version    = 3.1.7
 release    = 1
 
 groups     = System/Filesystems
@@ -30,11 +30,10 @@ build
        end
 
        configure_options += \
-               --mandir=/usr/share/man \
                --bindir=/sbin \
                --sbindir=/sbin \
-               --libdir=/lib \
-               --libexecdir=/usr/lib \
+               --libdir=/%{lib} \
+               --libexecdir=%{libdir} \
                --enable-readline=yes \
                --enable-blkid=yes \
                --disable-static
@@ -46,23 +45,20 @@ build
                        -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
        end
 
-       make_build_targets +=\
-               V=1 DEBUG=-DNDEBUG
-
+       make_build_targets += V=1 DEBUG=-DNDEBUG
 
        install
-               make install install-dev install-qa DIST_ROOT=%{BUILDROOT}
+               make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT}
 
-               chmod -v 755 %{BUILDROOT}/lib/libhandle.so*
-               rm -vf %{BUILDROOT}/lib/libhandle.so
-               mkdir -pv %{BUILDROOT}/usr/lib
-               ln -svf ../../lib/libhandle.so.1 %{BUILDROOT}/usr/lib/libhandle.so
+               chmod -v 755 %{BUILDROOT}/%{lib}/libhandle.so*
+               rm -vf %{BUILDROOT}/%{lib}/libhandle.so
+               mkdir -pv %{BUILDROOT}%{libdir}
+               ln -svf ../../%{lib}/libhandle.so.1 %{BUILDROOT}%{libdir}/libhandle.so
        end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL