From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 17 Mar 2012 10:07:17 +0000 (+0100)
Subject: libsepol: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cce1fecc6adf417d255574f2e808a3d52afc6fe;p=ipfire-3.x.git

libsepol: Make package work on x86_64.

Conflicts:

	libsepol/libsepol.nm
---

diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm
index 805918685..19042fd00 100644
--- a/libsepol/libsepol.nm
+++ b/libsepol/libsepol.nm
@@ -5,7 +5,7 @@
 
 name       = libsepol
 version    = 2.1.4
-release    = 3
+release    = 4
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -22,14 +22,16 @@ sources    = %{thisapp}.tgz
 build
 	# Keep static libsepol.a for some selinux tools, that needs to link 
 	# against it. We will put it into an own package.
-	keep_libraries = /usr/lib/libsepol.a
+	keep_libraries = %{libdir}/libsepol.a
 
 	build
 		make clean
 		make CFLAGS="%{CFLAGS}" %{PARALELLISMFLAGS}
 	end
 
-	make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \
+	# Install libraries to correct place.
+	make_install_targets += \
+		LIBDIR="%{BUILDROOT}%{libdir}" \
 		SHLIBDIR="%{BUILDROOT}/%{lib}"
 
 	install_cmds
@@ -58,7 +60,7 @@ packages
 		groups = Development/Libraries
 
 		files
-			/usr/lib/libsepol.a
+			%{libdir}/libsepol.a
 		end
 	end
 end