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

[Nalin Dahyabhai]

Author: nalin

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

Modified Files:
	nss_ldap.spec 
Log Message:
* Fri Jun 19 2009 Kedar Sovani <kedars at marvell.com>  - 264-3
- BuildRequires: openssl-static

* Fri Jun 19 2009 Nalin Dahyabhai <nalin at redhat.com>
- revert most of the previous round of changes: splitting pam_ldap off
  won't be helpful in the long term if it, too, is eventually going to conflict
  with the nss-ldapd package



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- nss_ldap.spec	6 Apr 2009 15:14:54 -0000	1.109
+++ nss_ldap.spec	19 Jun 2009 16:22:29 -0000	1.110
@@ -1,9 +1,8 @@
-%define nss_ldap_version 264
 %define pam_ldap_version 184
-Summary: NSS library for LDAP
+Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
-Version: %{nss_ldap_version}
-Release: 100%{?dist}
+Version: 264
+Release: 3%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -29,34 +28,23 @@ Patch20: pam_ldap-184-nsrole.patch
 URL: http://www.padl.com/
 License: LGPLv2+
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{nss_ldap_version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool
-BuildRequires: openssl-devel, pam-devel
+BuildRequires: openssl-devel, openssl-static, pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openldap-devel >= 2.0.27
 BuildRequires: krb5-devel >= 1.4
 Requires: nscd
-Requires(post): grep, mktemp, sed, textutils, /sbin/ldconfig
-# We need this file, and for now it belongs to pam_ldap (we use that one,
-# anyway).
-Requires: /etc/ldap.conf
-# Don't risk anything weird happening at upgrade-time by making sure we pull in
-# the matching pam_ldap package.
-Requires: /%{_lib}/security/pam_ldap.so
-
-%package -n pam_ldap
-Summary: PAM module for LDAP
-Version: %{pam_ldap_version}
-License: LGPLv2+
+Obsoletes: pam_ldap
 Requires(post): grep, mktemp, sed, textutils, /sbin/ldconfig
 
 %description
+This package includes two LDAP access clients: nss_ldap and pam_ldap.
 Nss_ldap is a set of C library extensions that allow X.500 and LDAP
 directory servers to be used as a primary source of aliases, ethers,
 groups, hosts, networks, protocol, users, RPCs, services, and shadow
 passwords (instead of or in addition to using flat files or NIS).
 
-%description -n pam_ldap
 Pam_ldap is a module for Linux-PAM that supports password changes, V2
 clients, Netscape's SSL, ypldapd, Netscape Directory Server password
 policies, access authorization, and crypted hashes.
@@ -64,12 +52,15 @@ policies, access authorization, and cryp
 %prep
 %setup -q -c -a 1
 cp %{SOURCE5} .
-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}/
-cp nss_ldap-%{nss_ldap_version}/snprintf.h pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{version}/ldap.conf ldap.conf.nss_ldap
+cp pam_ldap-%{pam_ldap_version}/ldap.conf ldap.conf.pam_ldap
 
-pushd nss_ldap-%{nss_ldap_version}
+cp nss_ldap-%{version}/resolve.c pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{version}/resolve.h pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{version}/snprintf.c pam_ldap-%{pam_ldap_version}/
+cp nss_ldap-%{version}/snprintf.h pam_ldap-%{pam_ldap_version}/
+
+pushd nss_ldap-%{version}
 %patch8 -p1 -b .soname
 %patch17 -p1 -b .res_init
 autoreconf -f -i
@@ -90,7 +81,21 @@ popd
 
 rm -f pam.d/*.pam_console
 
-cp %{_datadir}/libtool/config/config.{sub,guess} nss_ldap-%{nss_ldap_version}/
+cp nss_ldap-%{version}/ANNOUNCE             ANNOUNCE.nss_ldap
+cp nss_ldap-%{version}/AUTHORS              AUTHORS.nss_ldap
+cp nss_ldap-%{version}/ChangeLog            ChangeLog.nss_ldap
+cp nss_ldap-%{version}/COPYING              COPYING.nss_ldap
+cp nss_ldap-%{version}/NEWS                 NEWS.nss_ldap
+cp nss_ldap-%{version}/README               README.nss_ldap
+cp 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-%{version}/
 cp %{_datadir}/libtool/config/config.{sub,guess} pam_ldap-%{pam_ldap_version}/
 
 %build
@@ -103,17 +108,17 @@ pushd pam_ldap-%{pam_ldap_version}
 make %{?_smp_mflags}
 popd
 
-pushd nss_ldap-%{nss_ldap_version}
+pushd nss_ldap-%{version}
 %configure \
         --with-ldap=openldap \
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lz -lsasl2 -lssl -lgssapi_krb5 -lcrypto -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
-%{SOURCE7}       ./nss_ldap-%{nss_ldap_version}/nss_ldap.so
+%{SOURCE7}       ./nss_ldap-%{version}/nss_ldap.so
 %{SOURCE7} -lpam ./pam_ldap-%{pam_ldap_version}/pam_ldap.so
 
 %install
@@ -126,8 +131,8 @@ mkdir -p $RPM_BUILD_ROOT/{etc,%{_lib}/se
 # filenames that the glibc-bundled modules do, but that doesn't tell us anything
 # more than which version of libc was available at build time.  People tend to
 # assume that's also the nss_ldap version, too, so forget that.
-libcver=%{nss_ldap_version}
-make -C nss_ldap-%{nss_ldap_version} install \
+libcver=%{version}
+make -C nss_ldap-%{version} install \
         DESTDIR=$RPM_BUILD_ROOT \
         INST_UID=`id -un` INST_GID=`id -gn` \
         LIBC_VERS=$libcver
@@ -155,9 +160,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/../%{_l
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%post -n pam_ldap
+%post
+/sbin/ldconfig
 # 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
@@ -175,33 +179,25 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) /%{_libdir}/libnss_ldap-*.so
 %attr(0755,root,root) /%{_libdir}/libnss_ldap.so.?
-%attr(0755,root,root) %{_libdir}/libnss_ldap.so
-%attr(0644,root,root) %{_mandir}/man5/nss_ldap.5*
-%doc README.TLS
-%doc nss_ldap-%{nss_ldap_version}/ANNOUNCE
-%doc nss_ldap-%{nss_ldap_version}/AUTHORS
-%doc nss_ldap-%{nss_ldap_version}/ChangeLog
-%doc nss_ldap-%{nss_ldap_version}/COPYING
-%doc nss_ldap-%{nss_ldap_version}/NEWS
-%doc nss_ldap-%{nss_ldap_version}/README
-%doc nss_ldap-%{nss_ldap_version}/nsswitch.ldap
-
-%files -n pam_ldap
-%defattr(-,root,root)
 %attr(0755,root,root) /%{_lib}/security/*.so*
-%attr(0644,root,root) %{_mandir}/man5/pam_ldap.5*
+%attr(0755,root,root) %{_libdir}/libnss_ldap.so
+%attr(0644,root,root) %{_mandir}/man5/*.5*
 %attr(0644,root,root) %config(noreplace) /etc/ldap.conf
+%doc README.TLS
+%doc nsswitch.ldap *.nss_ldap *.pam_ldap
 %doc pam_ldap-%{pam_ldap_version}/pam.d
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
-%doc pam_ldap-%{pam_ldap_version}/AUTHORS
-%doc pam_ldap-%{pam_ldap_version}/ChangeLog
-%doc pam_ldap-%{pam_ldap_version}/COPYING
-%doc pam_ldap-%{pam_ldap_version}/COPYING.LIB
-%doc pam_ldap-%{pam_ldap_version}/NEWS
-%doc pam_ldap-%{pam_ldap_version}/README
 
 %changelog
+* Fri Jun 19 2009 Kedar Sovani <kedars at marvell.com>  - 264-3
+- BuildRequires: openssl-static
+
+* Fri Jun 19 2009 Nalin Dahyabhai <nalin at redhat.com>
+- revert most of the previous round of changes: splitting pam_ldap off
+  won't be helpful in the long term if it, too, is eventually going to conflict
+  with the nss-ldapd package
+
 * Mon Apr  6 2009 Nalin Dahyabhai <nalin at redhat.com> - 264/184-100
 - split pam_ldap off into a separate binary package
 - require /%{_lib}/security/pam_ldap.so to pull in pam_ldap on upgrades