From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Apr 2012 09:24:50 +0000 (+0200)
Subject: xfsprogs: Update to 3.1.8.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09a9fc3baf6533d4e64fdc88f301dd25541dde6d;p=ipfire-3.x.git

xfsprogs: Update to 3.1.8.

Move everything to /usr.
---

diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index b8ee34e04..ec0e48633 100644
--- 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