--- rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2013/03/09 23:32:12	1.11
+++ rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2015/02/11 15:44:31	1.20
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.10 2013/03/09 23:31:40 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.19 2014/11/11 21:50:24 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 9
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,15 @@ Patch4: e-smith-ldap-5.4.0-empty_slapd.d
 Patch5: e-smith-ldap-5.4.0-wait_slapd_initialization.patch
 Patch6: e-smith-ldap-5.4.0-db_archive.patch
 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
+Patch12: e-smith-ldap-5.4.0-stop_ldap_on_shutdown.patch
+Patch13: e-smith-ldap-5.4.0-checkpoint_in_slapd_conf.patch
+Patch14: e-smith-ldap-5.4.0-chown_db_files.patch
+Patch15: e-smith-ldap-5.4.0-symlink_init_to_sv.patch
+Patch16: e-smith-ldap-5.4.0-pdbedit_lang_and_tz_independent.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -34,6 +43,35 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Wed Feb 11 2015 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-18.sme
+- Make pdbedit output independent from locale and timezone so it can be
+  parsed [SME: 8841]
+
+* Tue Nov 11 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-17.sme
+- Symlink /etc/init.d/ldap to /usr/bin/sv [SME: 8635]
+
+* Tue Nov 11 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-16.sme
+- Chown all DB files to ldap before staring slapd [SME: 8635]
+
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-15.sme
+- Set checkpoint in slapd.conf instead of DB_CONFIG [SME: 8621]
+
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-14.sme
+- Stop ldap on shutdown (rc0 and rc6) [SME: 8611]
+
+* 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]
+
+* Wed Nov 13 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-10.sme
+- Adjust slapd ACL [SME: 8000]
+
 * Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 5.4.0-9.sme
 - Add dummy unused file to slapd.d to prevent openldap-servers
   post script from running [SME: 7258]
@@ -962,6 +1000,15 @@ e-smith server and gateway software - LD
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 perl createlinks