xfsprogs: Update to 3.1.8.

Move everything to /usr.

diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index b8ee34e04fe91e5872a0b9aca8774d29c1b68ed6..ec0e486337ac1328fe3a5c7306d412e1a0cbd81f 100644 (file)
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = xfsprogs
-version    = 3.1.7
+version    = 3.1.8
 release    = 1
 
 groups     = System/Filesystems
@@ -30,35 +30,24 @@ build
        end
 
        configure_options += \
-               --bindir=/sbin \
-               --sbindir=/sbin \
-               --libdir=/%{lib} \
                --libexecdir=%{libdir} \
                --enable-readline=yes \
-               --enable-blkid=yes \
-               --disable-static
-
-       configure_cmds
-               # Kill rpaths
-               sed -i libtool \
-                       -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-                       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
-       end
+               --enable-blkid=yes
 
        make_build_targets += V=1 DEBUG=-DNDEBUG
 
        install
-               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}%{libdir}
-               ln -svf ../../%{lib}/libhandle.so.1 %{BUILDROOT}%{libdir}/libhandle.so
+               make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT} \
+                       PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
        end
 end
 
 packages
        package %{name}
+               conflicts
+                       filesystem < 002
+               end
+       end
 
        package %{name}-devel
                template DEVEL