--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/12/01 19:24:58	1.84
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2015/02/11 15:52:01	1.94
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.83 2010/12/01 03:43:48 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.93 2013/02/22 18:09:26 vip-ire Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 72
+%define release 81
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -76,12 +76,19 @@ Patch62: e-smith-ldap-5.2.0-ldapmodify.p
 Patch63: e-smith-ldap-5.2.0-fix-department.patch
 Patch64: e-smith-ldap-5.2.0-update-ldap-later.patch
 Patch65: e-smith-ldap-5.2.0-ldap-init.patch
+Patch66: e-smith-ldap-5.2.0-replace-logic.patch
+Patch67: e-smith-ldap-5.2.0-dont_set_gecos_in_ldap.patch
+Patch68: e-smith-ldap-5.2.0-check_slapd.conf_syntax.patch
+Patch69: e-smith-ldap-5.2.0-remove_bdb_logs.patch
+Patch70: e-smith-ldap-5.2.0-wait_slapd_initialization.patch
+Patch71: e-smith-ldap-5.2.0-pdbedit_lang_and_tz_independent.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: e-smith-lib >= 1.15.1-16
 Requires: openldap >= 2.0.0
 Requires: openldap-clients
+Requires: openldap-servers
 Requires: perl(Net::LDAP)
 Requires: e-smith-formmagick >= 1.4.0-9
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -91,6 +98,34 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Wed Feb 11 2015 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-81.sme
+- Make pdbedit output independent from locale and timezone so it can be
+  parsed [SME: 7473]
+
+* Fri Feb 23 2013 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-80.sme
+- Wait for slapd to be ready before running bootstrap-ldap-save [SME: 7394]
+
+* Thu Feb  7 2013 Charlie Brady <charlie_brady@mitel.com> 5.2.0-79.sme
+- Add missing dependency on openldap-servers [SME: 7233]
+
+* Tue Nov 13 2012 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-78.sme
+- Fix removing old BDB log files [SME: 7166]
+
+* Tue Nov 13 2012 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-77.sme
+- Remove unused BDB log files [SME: 7166]
+
+* Mon Mar 14 2011 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-76.sme
+- Check slapd.conf syntax before trying to dump the database [SME: 6452]
+
+* Mon Mar 14 2011 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-75.sme
+- Stop using gecos attribute in LDAP [SME: 6539]
+
+* Wed Dec 1 2010 Shad L. Lords <slord@mail.com> 5.2.0-74.sme
+- Fix replace logic in ldif-fix [SME: 6423]
+
+* Wed Dec 1 2010 Shad L. Lords <slord@mail.com> 5.2.0-73.sme
+- Fix permissions on ldif-fix script [SME: 6244]
+
 * Wed Dec 1 2010 Shad L. Lords <slord@mail.com> 5.2.0-72.sme
 - Replace convert_ldif with ldif-fix script [SME: 6244]
 - Remove ldif template and expansion [SME: 6421]
@@ -1031,6 +1066,12 @@ e-smith server and gateway software - LD
 %patch63 -p1
 %patch64 -p1
 %patch65 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
+%patch69 -p1
+%patch70 -p1
+%patch71 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1056,7 +1097,7 @@ rm -f %{name}-%{version}-%{release}-file
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /var/service/ldap/run 'attr(0750,root,root)' \
     --file /var/service/ldap/log/run 'attr(0750,root,root)' \
-    --file /var/service/ldap/convert_ldif 'attr(0750,root,root)' \
+    --file /var/service/ldap/ldif-fix 'attr(0750,root,root)' \
     --file /var/service/ldap/finish 'attr(0750,root,root)' \
     --file /var/service/ldap/control/1 'attr(0750,root,root)' \
     --dir /var/log/bdb 'attr(0700,ldap,ldap)' \