nss_ldap: Fix dependency to pam_ldap and move all to /usr.

diff --git a/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm
index fa87ed0e114e6e20e25c67a3ee007145550bc9fe..0c7669b1d6d1e312703b0945f0ffd2333607d102 100644 (file)
--- a/nss_ldap/nss_ldap.nm
+++ b/nss_ldap/nss_ldap.nm
@@ -5,7 +5,7 @@
 
 name       = nss_ldap
 version    = 265
-release    = 3
+release    = 4
 
 groups     = System/Base
 url        = http://www.padl.com/
@@ -47,7 +47,6 @@ build
 
        configure_options += \
                --sysconfdir=/etc \
-               --libdir=/%{lib} \
                --with-ldap-lib=openldap \
                --enable-rfc2307bis \
                --with-ldap-conf-file=/etc/nss_ldap.conf \
@@ -75,8 +74,6 @@ build
                # Remove awkward directory
                rm -rvf %{BUILDROOT}/usr/usr
 
-               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
 
@@ -91,7 +88,12 @@ end
 packages
        package %{name}
                requires
-                       /%{lib}/security/pam_ldap.so
+                       %{libdir}/security/pam_ldap.so
+               end
+
+               configfiles
+                       %{sysconfdir}/nss_ldap.conf
+                       %{sysconfdir}/nss_ldap.secret
                end
        end