diff --git a/pam_ldap.spec b/pam_ldap.spec index 78a4503..d8886e5 100644 --- a/pam_ldap.spec +++ b/pam_ldap.spec @@ -30,9 +30,11 @@ BuildRequires: autoconf, automake, libtool BuildRequires: pam-devel BuildRequires: openldap-devel >= 2.0.27 Conflicts: nss_ldap < 265 +Conflicts: filesystem < 3 +Provides: %{_libdir}/security/pam_ldap.so Requires(pre): coreutils Requires(post): coreutils,/sbin/ldconfig -# The pam package supplies /%{_lib}/security. +# The pam package supplies %{_libdir}/security. Requires: pam %description @@ -66,7 +68,7 @@ cp %{_datadir}/libtool/config/config.{sub,guess} . %build # The version-embedding program's built in the build directory, so add it to # the path. -%configure --libdir=/%{_lib} \ +%configure --libdir=%{_libdir} \ --with-ldap-conf-file=%{_sysconfdir}/%{name}.conf \ --with-ldap-secret-file=%{_sysconfdir}/%{name}.secret env PATH=`pwd`:"$PATH" make %{?_smp_mflags} LDFLAGS=-Wl,-z,nodelete @@ -76,7 +78,7 @@ sh %{SOURCE7} -lpam ./pam_ldap.so %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/{etc,%{_lib}/security,%{_libdir}} +mkdir -p $RPM_BUILD_ROOT/{etc,%{_libdir}/security} # Install the default configuration file, but change the search bases to # something generic to avoid overloading padl.com servers and to match @@ -125,7 +127,7 @@ fi %doc pam.d %doc ldapns.schema %doc ns-pwd-policy.schema -%attr(0755,root,root) /%{_lib}/security/*.so* +%attr(0755,root,root) %{_libdir}/security/*.so* %attr(0644,root,root) %{_mandir}/man5/*.5* %attr(0644,root,root) %config(noreplace) /etc/%{name}.conf %attr(0600,root,root) %ghost %config(noreplace) /etc/%{name}.secret