--- rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2013/02/19 21:28:04	1.4
+++ rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2013/02/24 15:49:57	1.7
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.3 2013/02/18 20:47:02 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.6 2013/02/22 17:46:38 vip-ire Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.4.0
-%define release 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,9 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch1: e-smith-ldap-5.4.0-remove_autofs.patch
 Patch2: e-smith-ldap-5.4.0-remove_schemacheck_off.patch
+Patch3: e-smith-ldap-5.4.0-use_slapd.conf.patch
+Patch4: e-smith-ldap-5.4.0-empty_slapd.d.patch
+Patch5: e-smith-ldap-5.4.0-wait_slapd_initialization.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -28,6 +31,15 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Fri Feb 22 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-7.sme
+- Wait for slapd to be ready before running bootstrap-ldap-save [SME: 7395]
+
+* Fri Feb 22 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-6.sme
+- Do not remove slapd.d, just make sure it's empty [SME: 7258]
+
+* Thu Feb 21 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-5.sme
+- Make sure slapd uses slapd.conf instead of slapd.d [SME: 7258]
+
 * Tue Feb 19 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-4.sme
 - Remove now unneeded and out of scope schemacheck directive [SME: 7260]
 
@@ -935,6 +947,9 @@ e-smith server and gateway software - LD
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks