--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/08 18:58:26	1.75
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/12/01 19:24:58	1.84
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.74 2010/11/05 19:02:54 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.83 2010/12/01 03:43:48 slords Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 63
+%define release 72
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -68,6 +68,14 @@ Patch54: e-smith-ldap-5.2.0-ldap-auth.pa
 Patch55: e-smith-ldap-5.2.0-unix-cleanup.patch
 Patch56: e-smith-ldap-5.2.0-group-attrs.patch
 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
+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
@@ -83,6 +91,35 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Tue Nov 30 2010 Shad L. Lords <slord@mail.com> 5.2.0-70.sme
+- Use correct field (Dept) for ou ldap field [SME: 6417]
+
+* Tue Nov 30 2010 Shad L. Lords <slord@mail.com> 5.2.0-69.sme
+- Add rfc2739.schem back in and include in config so upgrades work [SME: 5159]
+
+* 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]
+
+* Wed Nov 10 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-64.sme
+- Fixed ldif templates error [SME: 6356]
+
 * Mon Nov 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-63.sme
 - Simplify ldap-update for most events [SME: 6354]
 
@@ -986,12 +1023,18 @@ e-smith server and gateway software - LD
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -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