From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 6 Jan 2012 16:32:19 +0000 (+0100)
Subject: libcap-ng: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87235625d3f512a08e18d3e6024a1cceca72cb83;p=ipfire-3.x.git

libcap-ng: Make package work on x86_64.
---

diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
index fae925bb5..d0a015fa5 100644
--- a/libcap-ng/libcap-ng.nm
+++ b/libcap-ng/libcap-ng.nm
@@ -5,7 +5,7 @@
 
 name       = libcap-ng
 version    = 0.6.6
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://people.redhat.com/sgrubb/libcap-ng
@@ -27,11 +27,11 @@ build
 
 	install_cmds
 		# Move libraries to lib
-		mkdir -pv %{BUILDROOT}/lib
-		mv -vf %{BUILDROOT}/usr/lib/libcap-ng.so.* %{BUILDROOT}/lib/
+		mkdir -pv %{BUILDROOT}/%{lib}
+		mv -vf %{BUILDROOT}%{libdir}/libcap-ng.so.* %{BUILDROOT}/%{lib}/
 
 		# Recreate symlink
-		ln -svf ../../lib/libcap-ng.so.0 %{BUILDROOT}/usr/lib/libcap-ng.so
+		ln -svf ../../%{lib}/libcap-ng.so.0 %{BUILDROOT}%{libdir}/libcap-ng.so
 	end
 
 	# XXX Testsuite is broken by the package developers
@@ -42,7 +42,6 @@ end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL