rpms/nss_ldap/devel nss_ldap.spec,1.108,1.109

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22294

Modified Files:
	nss_ldap.spec 
Log Message:
- remove some cruft
- move the %%postun that fixes up pam configs to the pam_ldap package



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- nss_ldap.spec	6 Apr 2009 14:57:59 -0000	1.108
+++ nss_ldap.spec	6 Apr 2009 15:14:54 -0000	1.109
@@ -64,9 +64,6 @@
 %prep
 %setup -q -c -a 1
 cp %{SOURCE5} .
-cp nss_ldap-%{nss_ldap_version}/ldap.conf ldap.conf.nss_ldap
-cp pam_ldap-%{pam_ldap_version}/ldap.conf ldap.conf.pam_ldap
-
 cp nss_ldap-%{nss_ldap_version}/resolve.c pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/resolve.h pam_ldap-%{pam_ldap_version}/
 cp nss_ldap-%{nss_ldap_version}/snprintf.c pam_ldap-%{pam_ldap_version}/
@@ -93,20 +90,6 @@
 
 rm -f pam.d/*.pam_console
 
-cp nss_ldap-%{nss_ldap_version}/ANNOUNCE             ANNOUNCE.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/AUTHORS              AUTHORS.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/ChangeLog            ChangeLog.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/COPYING              COPYING.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/NEWS                 NEWS.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/README               README.nss_ldap
-cp nss_ldap-%{nss_ldap_version}/nsswitch.ldap        nsswitch.ldap
-cp pam_ldap-%{pam_ldap_version}/AUTHORS     AUTHORS.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/ChangeLog   ChangeLog.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/COPYING     COPYING.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/COPYING.LIB COPYING.LIB.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/NEWS        NEWS.pam_ldap
-cp pam_ldap-%{pam_ldap_version}/README      README.pam_ldap
-
 cp %{_datadir}/libtool/config/config.{sub,guess} nss_ldap-%{nss_ldap_version}/
 cp %{_datadir}/libtool/config/config.{sub,guess} pam_ldap-%{pam_ldap_version}/
 
@@ -172,8 +155,9 @@
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+
+%post -n pam_ldap
 # Fix a logic mismatch between what the version of authconfig in RHL 7.2 would
 # generate and this version of pam_ldap.
 if grep -q '^account     required      /lib/security/pam_ldap.so$' /etc/pam.d/system-auth ; then
@@ -222,6 +206,8 @@
 - split pam_ldap off into a separate binary package
 - require /%{_lib}/security/pam_ldap.so to pull in pam_ldap on upgrades
 - require our configuration file to come from somewhere
+- remove some cruft
+- move the %%postun that fixes up pam configs to the pam_ldap package
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 264-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild