Make building of pam_ldap dependent on the release

Conditionalize whether or not we build pam_ldap on what the target
release is, in case we want to merge this back onto older release
branches later.

nss-pam-ldapd.spec

@@ -50,9 +50,18 @@ Provides:	nss-ldapd = %{version}-%{release}
 Provides:       nss_ldap = 265-12
 Obsoletes:      nss_ldap < 265-11
 
+%if 0%{?fedora} > 18 || 0%{?rhel} > 6
 # Obsolete PADL's pam_ldap
 Provides:       pam_ldap = 185-9
 Obsoletes:      pam_ldap < 185-8
+%global         build_pam_ldap 1
+%else
+# Pull in the pam_ldap module, which is its own package in F14 and later, to
+# keep upgrades from removing the module.  We used to disable nss-pam-ldapd's
+# own pam_ldap.so when it wasn't mature enough.
+Requires:       pam_ldap%{?_isa}
+%global         build_pam_ldap 0
+%endif
 
 # Pull in nscd, which is recommended.
 Requires:	nscd
@@ -82,7 +91,12 @@ nsswitch module.
 autoreconf -f -i
 
 %build
-%configure --libdir=%{nssdir} --with-pam-seclib-dir=%{pamdir}
+%configure --libdir=%{nssdir} \
+%if %{build_pam_ldap}
+	--with-pam-seclib-dir=%{pamdir}
+%else
+	--disable-pam
+%endif
 make %{?_smp_mflags}
 
 %check
@@ -135,7 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_sbindir}/*
 %{nssdir}/*.so.*
+%if %{build_pam_ldap}
 %{pamdir}/pam_ldap.so
+%endif
 %{_mandir}/*/*
 %attr(0600,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/nslcd.conf
 %if %{tmpfiles}
@@ -285,6 +301,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 18 2013 Nalin Dahyabhai <nalin@redhat.com> 0.8.12-1
+- update to 0.8.12
+- make building pam_ldap conditional on the targeted release
+
 * Sun Sep 09 2012 Jakub Hrozek <jhrozek@redhat.com> 0.7.17-1
 - new upstream release 0.7.17