From 7a4345c7ff6e121b3fab7cecc6103952f264ff7d Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Sun, 5 Aug 2012 00:16:20 +0200 Subject: [PATCH] Obsolete PADL's pam_ldap, build the one from nss-pam-ldapd --- nss-pam-ldapd.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec index a25dcb3..f5efae0 100644 --- a/nss-pam-ldapd.spec +++ b/nss-pam-ldapd.spec @@ -14,7 +14,7 @@ Name: nss-pam-ldapd Version: 0.7.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An nsswitch module which uses directory servers Group: System Environment/Base License: LGPLv2+ @@ -39,10 +39,10 @@ Provides: nss-ldapd = %{version}-%{release} Provides: nss_ldap = 265-12 Obsoletes: nss_ldap < 265-11 -# Pull in the pam_ldap module, which is its own package in F14 and later, to -# keep upgrades from removing the module. We currently disable nss-pam-ldapd's -# own pam_ldap.so until it's more mature. -Requires: pam_ldap%{?_isa} +# Obsolete PADL's pam_ldap +Provides: pam_ldap = 185-9 +Obsoletes: pam_ldap < 185-8 + # Pull in nscd, which is recommended. Requires: nscd %if %{sysvinit} @@ -73,7 +73,7 @@ nsswitch module. autoreconf -f -i %build -%configure --libdir=/%{_lib} --disable-pam +%configure --libdir=/%{_lib} make %{?_smp_mflags} %check @@ -120,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO %{_sbindir}/* /%{_lib}/*.so.* +/%{_lib}/security/pam_ldap.so %{_mandir}/*/* %attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/nslcd.conf %if %{tmpfiles} @@ -269,9 +270,12 @@ exit 0 %endif %changelog -* Sat Aug 05 2012 Jakub Hrozek - 0.7.16-4 +* Sun Aug 05 2012 Jakub Hrozek - 0.7.16-5 - Obsolete PADL's nss_ldap +* Sat Aug 04 2012 Jakub Hrozek - 0.7.16-4 +- Build the PAM module, obsoletes PADL's pam-ldap + * Fri Jul 20 2012 Fedora Release Engineering - 0.7.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild