--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/02 13:43:38	1.70
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/30 18:10:29	1.82
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.69 2010/10/30 14:04:50 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.81 2010/11/30 18:06:09 slords Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 57
+%define release 70
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -64,6 +64,16 @@ Patch50: e-smith-ldap-5.2.0-add_www_move
 Patch51: e-smith-ldap-5.2.0-fix_ldap_update.patch
 Patch52: e-smith-ldap-5.2.0-ldap-init-script.patch
 Patch53: e-smith-ldap-5.2.0-enable_ldap_init.patch
+Patch54: e-smith-ldap-5.2.0-ldap-auth.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -79,6 +89,45 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Fri Nov 5 2010 Shad L. Lords <slords@mail.com> 5.2.0-62.sme
+- Adjust call to ldap-update later create/modify/delete [SME: 6284]
+
+* Thu Nov 4 2010 Shad L. Lords <slords@mail.com> 5.2.0-61.sme
+- Apply correct patch for group descriptions/password [SME: 6337]
+
+* Thu Nov 4 2010 Shad L. Lords <slords@mail.com> 5.2.0-60.sme
+- groups don't have password, some don't have description [SME: 6337]
+
+* Tue Nov 2 2010 Shad L. Lords <slords@mail.com> 5.2.0-59.sme
+- Remove unix users/groups if ldap is master [SME: 6325]
+
+* Tue Nov 2 2010 Shad L. Lords <slords@mail.com> 5.2.0-58.sme
+- Disable ldap-delete if ldap is master [SME: 6324]
+
 * Tue Nov 02 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-57.sme
 - Enable the new ldap.init service [SME: 6231]
 
@@ -960,12 +1009,20 @@ e-smith server and gateway software - LD
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -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