- smbk5pwd added

- correctly distribute modules between servers and servers-sql packages
Resolves: #220895

openldap.spec

@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -42,6 +42,7 @@ Patch6: openldap-2.3.11-nosql.patch
 Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.34-quiet-slaptest.patch
 Patch10: openldap-2.3.34-pthread.patch
+Patch11: openldap-2.3.34-smbk5pwd.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -68,7 +69,8 @@ Patch401: db-4.4.20-2.patch
 URL: http://www.openldap.org/
 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-devel,
+BuildRequires: openssl-devel, pam-devel, perl, pkgconfig
+#, tcp_wrappers-devel,
 BuildRequires: unixODBC-devel, libtool-ltdl-devel
 Requires: glibc >= 2.2.3-48, mktemp
 
@@ -180,6 +182,7 @@ pushd openldap-%{version_23}
 %patch8 -p1 -b .gethostbyname_r
 %patch9 -p1 -b .quiet-slaptest
 %patch10 -p1 -b .pthread
+%patch11 -p1 -b .smbk5pwd
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -703,7 +706,7 @@ fi
 %attr(0755,ldap,ldap) %dir /var/run/openldap
 %attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so
 %attr(0755,root,root) %dir %{_libdir}/openldap
-%attr(0755,root,root) %{_libdir}/openldap/*
+%attr(0755,root,root) %{_libdir}/openldap/[^b]*
 %ifarch %{nptl_arches}
 %ifnarch %{ix86}
 %attr(0755,root,root) %{_libdir}/tls/libslapd_db-*.*.so
@@ -717,7 +720,6 @@ fi
 %defattr(-,root,root)
 %doc openldap-%{version_23}/servers/slapd/back-sql/docs/*
 %doc openldap-%{version_23}/servers/slapd/back-sql/rdbms_depend
-%attr(0755,root,root) %{_libdir}/openldap
 %attr(0755,root,root) %{_libdir}/openldap/back_sql.la
 %attr(0755,root,root) %{_libdir}/openldap/back_sql*.so.*
 
@@ -741,6 +743,10 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Jun 29 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-5%{?dist}
+- smbk5pwd added (#220895)
+- correctly distribute modules between servers and servers-sql packages
+
 * Mon Jun 25 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-4%{?dist}
 - Fix initscript return codes (#242667)
 - Provide overlays (as modules; #246036, #245896)