--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/12 03:04:10	1.77
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/30 10:43:14	1.80
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.76 2010/11/10 18:08:28 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.79 2010/11/23 18:49:16 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 65
+%define release 68
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -70,6 +70,9 @@ Patch56: e-smith-ldap-5.2.0-group-attrs.
 Patch57: e-smith-ldap-5.2.0-simple-ldap-update.patch
 Patch58: e-smith-ldap-5.2.0-fixe_ldif_templates.patch
 Patch59: e-smith-ldap-5.2.0-locked-passwd.patch
+Patch60: e-smith-ldap-5.2.0-startup-order.patch
+Patch61: e-smith-ldap-5.2.0-remove_bogus_junk.patch
+Patch62: e-smith-ldap-5.2.0-ldapmodify.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -85,6 +88,15 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-68.sme
+- Use ldapmodify to load ldif, add -a if no changetype [SME: 6413]
+
+* Tue Nov 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-67.sme
+- Remove bogus junk attribute from ldif templates [SME: 6396]
+
+* Mon Nov 22 2010 Shad L. Lords <slord@mail.com> 5.2.0-66.sme
+- Change startup order for ldap [SME: 6390]
+
 * Thu Nov 11 2010 Shad L. Lords <slord@mail.com> 5.2.0-65.sme
 - Store locked password instead of expired password [SME: 6360]
 
@@ -996,12 +1008,13 @@ e-smith server and gateway software - LD
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
 perl createlinks
-mkdir -p root/etc/rc.d/rc7.d
-ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S77ldap
 mkdir -p root/home/e-smith/db/ldap
 
 mkdir -p root/etc/rc.d/init.d/supervise