rpms/nss-pam-ldapd/F-13 nss-pam-ldapd.spec,1.5,1.6 sources,1.5,1.6

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/nss-pam-ldapd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23512

Modified Files:
	nss-pam-ldapd.spec sources 
Log Message:
- resync with development stream, mainly to pull in the fix for #596691 and
  allow the traditional pam_ldap to be used along with nslcd



Index: nss-pam-ldapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss-pam-ldapd/F-13/nss-pam-ldapd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nss-pam-ldapd.spec	14 May 2010 22:07:03 -0000	1.5
+++ nss-pam-ldapd.spec	27 May 2010 21:33:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		nss-pam-ldapd
-Version:	0.7.5
-Release:	2%{?dist}
+Version:	0.7.6
+Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -8,7 +8,6 @@ URL:		http://arthurdejong.org/nss-pam-ld
 Source0:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz
 Source1:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.sig
 Source2:	nslcd.init
-Patch0:		nss-pam-ldapd-default.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openldap-devel, krb5-devel
 Obsoletes:	nss-ldapd < 0.7
@@ -31,7 +30,6 @@ nsswitch module.
 
 %prep
 %setup -q
-%patch0 -p0 -b .default
 
 %build
 %configure --libdir=/%{_lib} --disable-pam
@@ -42,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/{%{_initddir},%{_libdir}}
 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
 # what to expect can link directly with the module.
 if test %{_libdir} != /%{_lib} ; then
@@ -54,6 +53,7 @@ if test %{_libdir} != /%{_lib} ; then
 		$RPM_BUILD_ROOT/%{_libdir}/libnss_ldap.so
 	rm $RPM_BUILD_ROOT/rootfile
 fi
+%endif
 cat >> $RPM_BUILD_ROOT/%{_sysconfdir}/nslcd.conf << EOF
 uid nslcd
 gid ldap
@@ -73,8 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0600,root,root) %config(noreplace) /etc/nslcd.conf
 %attr(0755,root,root) %{_initddir}/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
+%endif
 
 %pre
 getent group  ldap  > /dev/null || \
@@ -157,6 +161,18 @@ fi
 exit 0
 
 %changelog
+* Thu May 27 2010 Nalin Dahyabhai <nalin at 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 at redhat.com> 0.7.6-1
+- update to 0.7.6
+
+* Mon May 17 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.5-3
+- switch to the upstream patch for #592411
+
 * Fri May 14 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.5-2
 - don't return an uninitialized buffer as the value for an optional attribute
   that isn't present in the directory server entry (#592411)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nss-pam-ldapd/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 May 2010 21:09:28 -0000	1.5
+++ sources	27 May 2010 21:33:05 -0000	1.6
@@ -1,2 +1,2 @@
-969dcab16a43b066cdf57633ebdf1124  nss-pam-ldapd-0.7.5.tar.gz
-eec4bcf141706adea1baba67e2529d95  nss-pam-ldapd-0.7.5.tar.gz.sig
+44aab952978fe193d65a14d3631c7957  nss-pam-ldapd-0.7.6.tar.gz
+27da4d6e4eb6155f750b0660c72163da  nss-pam-ldapd-0.7.6.tar.gz.sig