- make inclusion of the .so symlink conditional on being on a sufficiently-
new Fedora where pam_ldap isn't part of the nss_ldap package, so having this package conflict with nss_ldap doesn't require that pam_ldap be removed (#596691)
This commit is contained in:
parent
bc69bd82b0
commit
5892659cc0
@ -1,6 +1,6 @@
|
|||||||
Name: nss-pam-ldapd
|
Name: nss-pam-ldapd
|
||||||
Version: 0.7.6
|
Version: 0.7.6
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: An nsswitch module which uses directory servers
|
Summary: An nsswitch module which uses directory servers
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -40,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
mkdir -p $RPM_BUILD_ROOT/{%{_initddir},%{_libdir}}
|
mkdir -p $RPM_BUILD_ROOT/{%{_initddir},%{_libdir}}
|
||||||
install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initddir}/nslcd
|
install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initddir}/nslcd
|
||||||
|
%if 0%{?fedora} > 13
|
||||||
# Follow glibc's convention and provide a .so symlink so that people who know
|
# Follow glibc's convention and provide a .so symlink so that people who know
|
||||||
# what to expect can link directly with the module.
|
# what to expect can link directly with the module.
|
||||||
if test %{_libdir} != /%{_lib} ; then
|
if test %{_libdir} != /%{_lib} ; then
|
||||||
@ -52,6 +53,7 @@ if test %{_libdir} != /%{_lib} ; then
|
|||||||
$RPM_BUILD_ROOT/%{_libdir}/libnss_ldap.so
|
$RPM_BUILD_ROOT/%{_libdir}/libnss_ldap.so
|
||||||
rm $RPM_BUILD_ROOT/rootfile
|
rm $RPM_BUILD_ROOT/rootfile
|
||||||
fi
|
fi
|
||||||
|
%endif
|
||||||
cat >> $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf << EOF
|
cat >> $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf << EOF
|
||||||
uid nslcd
|
uid nslcd
|
||||||
gid ldap
|
gid ldap
|
||||||
@ -71,8 +73,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%attr(0600,root,root) %config(noreplace) /etc/nslcd.conf
|
%attr(0600,root,root) %config(noreplace) /etc/nslcd.conf
|
||||||
%attr(0755,root,root) %{_initddir}/nslcd
|
%attr(0755,root,root) %{_initddir}/nslcd
|
||||||
%attr(0755,nslcd,root) /var/run/nslcd
|
%attr(0755,nslcd,root) /var/run/nslcd
|
||||||
# This would be the only thing in the -devel subpackage, so we include it.
|
%if 0%{?fedora} > 13
|
||||||
|
# This would be the only thing in the -devel subpackage, so we include it. It
|
||||||
|
# will conflict with nss_ldap, so only include it for releases where pam_ldap is
|
||||||
|
# its own package.
|
||||||
/%{_libdir}/*.so
|
/%{_libdir}/*.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
getent group ldap > /dev/null || \
|
getent group ldap > /dev/null || \
|
||||||
@ -155,6 +161,12 @@ fi
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.6-2
|
||||||
|
- make inclusion of the .so symlink conditional on being on a sufficiently-
|
||||||
|
new Fedora where pam_ldap isn't part of the nss_ldap package, so having
|
||||||
|
this package conflict with nss_ldap doesn't require that pam_ldap be
|
||||||
|
removed (#596691)
|
||||||
|
|
||||||
* Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.6-1
|
* Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.6-1
|
||||||
- update to 0.7.6
|
- update to 0.7.6
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user