--- rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2014/10/24 07:15:04	1.13
+++ rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2014/10/24 08:04:23	1.15
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.12 2013/11/13 08:07:07 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.14 2014/10/24 07:42:52 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 11
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,8 @@ Patch6: e-smith-ldap-5.4.0-db_archive.pa
 Patch7: e-smith-ldap-5.4.0-unused.patch
 Patch8: e-smith-ldap-5.4.0-adjust_slapd_acl.patch
 Patch9: e-smith-ldap-5.4.0-dont_wipe_db_when_ldif_empty.patch
+Patch10: e-smith-ldap-5.4.0-db_recover_on_startup.patch
+Patch11: e-smith-ldap-5.4.0-dont_overwrite_ldif_with_empty.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -36,6 +38,13 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-13.sme
+- Don't overwrite the ldif dump if slapcat's output is empty
+  (code from Charlie Brady) [SME: 8621]
+
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-12.sme
+- Run db_recover on startup [SME: 8622]
+
 * Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-11.sme
 - Don't wipe LDAP DB when the ldif dump is empty [SME: 8619]
 
@@ -972,6 +981,8 @@ e-smith server and gateway software - LD
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks