From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 15:01:49 +0000 (+0100)
Subject: util-linux: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0484c1780cc275b5aa8a8dfe5f627d4384f6b1;p=ipfire-3.x.git

util-linux: Make package work on x86_64.
---

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 351c79496..707ead344 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,7 +6,7 @@
 name       = util-linux
 major_ver  = 2.20
 version    = %{major_ver}
-release    = 1
+release    = 2
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -126,7 +126,7 @@ packages
 		end
 
 		files
-			/lib/libblkid.*
+			/%{lib}/libblkid.*
 		end
 	end
 
@@ -137,8 +137,8 @@ packages
 
 		files
 			/usr/include/blkid/
-			/usr/lib/libblkid.*
-			/usr/lib/pkgconfig/blkid.pc
+			%{libdir}/libblkid.*
+			%{libdir}/pkgconfig/blkid.pc
 			/usr/share/man/man3/*blkid*
 		end
 	end
@@ -152,7 +152,7 @@ packages
 		end
 
 		files
-			/lib/libuuid.*
+			/%{lib}/libuuid.*
 		end
 	end
 
@@ -163,8 +163,8 @@ packages
 
 		files
 			/usr/include/uuid/
-			/usr/lib/libuuid.*
-			/usr/lib/pkgconfig/uuid.pc
+			%{libdir}/libuuid.*
+			%{libdir}/pkgconfig/uuid.pc
 			/usr/share/man/man3/*uuid*
 		end
 	end
@@ -178,7 +178,7 @@ packages
 		end
 
 		files
-			/lib/libmount.*
+			/%{lib}/libmount.*
 		end
 	end
 
@@ -189,8 +189,8 @@ packages
 
 		files
 			/usr/include/mount/
-			/usr/lib/libmount.*
-			/usr/lib/pkgconfig/mount.pc
+			%{libdir}/libmount.*
+			%{libdir}/pkgconfig/mount.pc
 			/usr/share/man/man3/*mount*
 		end
 	end