--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/12/01 03:43:48	1.83
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/12/01 19:30:40	1.86
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.82 2010/11/30 18:10:29 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.85 2010/12/01 19:30:05 slords Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 71
+%define release 73
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -75,6 +75,7 @@ Patch61: e-smith-ldap-5.2.0-remove_bogus
 Patch62: e-smith-ldap-5.2.0-ldapmodify.patch
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -90,6 +91,14 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+- Simplify ldap-update call by calling ldif-fix [SME: 6422]
+
 * Tue Nov 30 2010 Shad L. Lords <slord@mail.com> 5.2.0-71.sme
 - Update ldap database later to pick up samba group maps [SME: 6419]
 
@@ -1024,6 +1033,7 @@ e-smith server and gateway software - LD
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
+%patch65 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1049,7 +1059,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)' \