[nss-pam-ldapd] - change the file path Requires: we have for pam_ldap into a package name Requires: (#601931)

Nalin Dahyabhai nalin at fedoraproject.org
Mon Jun 13 20:29:22 UTC 2011


commit 51b8826bd7c64ea33062ef332b3df1593e37c31d
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Jun 13 16:28:41 2011 -0400

    - change the file path Requires: we have for pam_ldap into a package name
      Requires: (#601931)

 nss-pam-ldapd.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 45f62e7..0b15452 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -1,6 +1,6 @@
 Name:		nss-pam-ldapd
 Version:	0.7.13
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -14,10 +14,10 @@ BuildRequires:	openldap-devel, krb5-devel
 Obsoletes:	nss-ldapd < 0.7
 Provides:	nss-ldapd = %{version}-%{release}
 
-# Pull in the pam_ldap module, which is currently bundled with nss_ldap, to
+# 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:	/%{_lib}/security/pam_ldap.so
+Requires:	pam_ldap%{?_isa}
 # Pull in nscd, which is recommended.
 Requires:	nscd
 Requires(post):		/sbin/ldconfig, chkconfig, grep, sed
@@ -175,6 +175,10 @@ fi
 exit 0
 
 %changelog
+* Mon Jun 13 2011 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-5
+- change the file path Requires: we have for pam_ldap into a package name
+  Requires: (#601931)
+
 * Wed Mar 30 2011 Nalin Dahyabhai <nalin at redhat.com> 0.7.13-4
 - tag nslcd.conf with %%verify(not md5 size mtime), since we always tweak
   it in %%post (#692225)


More information about the scm-commits mailing list