rpms/openldap/FC-5 openldap.spec,1.57,1.58

[fedora-cvs-commits at redhat.com]

Author: jsafrane

Update of /cvs/dist/rpms/openldap/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28279

Modified Files:
	openldap.spec 
Log Message:
bind-libbind-devel removed from BuildRequires (bz#216851)
use %_localstatedir instead of var/ (bz#220970)
make slapadd quiet (bz#224581)
add few buzilla IDs to .spec


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- openldap.spec	23 Apr 2007 07:04:36 -0000	1.57
+++ openldap.spec	23 Apr 2007 07:43:38 -0000	1.58
@@ -66,7 +66,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
 BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
 BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
-BuildRequires: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
+BuildRequires: unixODBC-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
 %description
@@ -527,8 +527,8 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
 
-rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -574,7 +574,7 @@
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the uninstall of the previous version.
 if [ -s /var/lib/ldap/upgrade.ldif ] ; then
-	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif
+	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif >/dev/null 2>&1 
 	/bin/rm /var/lib/ldap/upgrade.ldif
 fi
 exec > /dev/null 2> /dev/null
@@ -724,8 +724,11 @@
     bz#190383: openldap 2.3 packages contain the administrator's guide for 2.2
     bz#204593: service ldap fails after having added entries to ldap
     bz#199322: RFE: perform cleanup in ldap.init
+    bz#211045: permissions of ldapi socket need to be world-writable
+    bz#209496: openldap-server syncrepl failure bug
+    bz#205827: CVE-2006-4600 openldap improper selfwrite access
 - Include the gethostbyname_r patch
-- include the correct guide.html
+- include the correct guide.html (bz#190383)
 - Fix the upgrade logic, so that upgrades from 2.3.30 to newer versions
   won't leave junk in /var/lib/ldap if it was empty, and correctly
   generates/uses the upgrade.ldif file otherwise.  Note that upgrades *to*