--- rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2013/02/13 18:51:13	1.2
+++ rpms/e-smith-ldap/sme9/e-smith-ldap.spec	2014/10/24 10:26:16	1.17
@@ -1,15 +1,28 @@
-# $Id: e-smith-ldap.spec,v 1.1 2013/02/13 15:43:13 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.16 2014/10/24 08:18:00 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 2
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -18,6 +31,7 @@ Requires: openldap >= 2.0.0
 Requires: openldap-clients
 Requires: openldap-servers
 Requires: perl(Net::LDAP)
+Requires: db4-utils
 Requires: e-smith-formmagick >= 1.4.0-9
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -26,6 +40,47 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Mon Feb 25 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-8.sme
+- Use db_archive to remove unused BDB log files [SME: 7403]
+
+* Sun Feb 24 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]
+
+* Mon Feb 18 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-3.sme
+- Stop trying to load autofs.schema [SME: 7259]
+
 * Wed Feb 13 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-2.sme
 - Add missing dependency on openldap-servers [SME: 7347]
 
@@ -925,6 +980,19 @@ e-smith server and gateway software - LD
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 perl createlinks