From 848ea2774e78455be611d2dffa384c03b39d5c0b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 16:01:43 +0100
Subject: [PATCH] nss_ldap: Make package work on x86_64.

---
 nss_ldap/nss_ldap.nm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm
index d5358cac1..fa87ed0e1 100644
--- a/nss_ldap/nss_ldap.nm
+++ b/nss_ldap/nss_ldap.nm
@@ -5,7 +5,7 @@
 
 name       = nss_ldap
 version    = 265
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://www.padl.com/
@@ -47,7 +47,7 @@ build
 
 	configure_options += \
 		--sysconfdir=/etc \
-		--libdir=/lib \
+		--libdir=/%{lib} \
 		--with-ldap-lib=openldap \
 		--enable-rfc2307bis \
 		--with-ldap-conf-file=/etc/nss_ldap.conf \
@@ -75,24 +75,23 @@ build
 		# Remove awkward directory
 		rm -rvf %{BUILDROOT}/usr/usr
 
-		mv -v %{BUILDROOT}/lib/* %{BUILDROOT}/usr/lib
-		rm -rvf %{BUILDROOT}/lib
-		ln -svf libnss_ldap-%{version}.so %{BUILDROOT}/usr/lib/libnss_ldap.so
+		mv -v %{BUILDROOT}/%{lib}/* %{BUILDROOT}%{libdir}
+		rm -rvf %{BUILDROOT}/%{lib}
+		ln -svf libnss_ldap-%{version}.so %{BUILDROOT}%{libdir}/libnss_ldap.so
+		ln -svf libnss_ldap.so.2 %{BUILDROOT}%{libdir}/libnss_ldap.so
 
 		rm -vf %{BUILDROOT}/etc/nsswitch.ldap
 
 		cd %{DIR_APP} && sed 's|dc=padl|dc=example|g' ldap.conf > \
 			%{BUILDROOT}/etc/nss_ldap.conf
 		touch %{BUILDROOT}/etc/nss_ldap.secret
-
-		ln -svf libnss_ldap.so.2 %{BUILDROOT}/usr/lib/libnss_ldap.so
 	end
 end
 
 packages
 	package %{name}
 		requires
-			/lib/security/pam_ldap.so
+			/%{lib}/security/pam_ldap.so
 		end
 	end
 
-- 
2.39.2