--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/10/28 07:39:37	1.66
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/05 05:13:58	1.73
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.65 2010/10/27 19:51:58 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.72 2010/11/05 01:39:52 slords Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 54
+%define release 61
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -62,11 +62,18 @@ Patch48: e-smith-ldap-5.2.0-add_nobody_a
 Patch49: e-smith-ldap-5.2.0-fix_nobody_and_shared_group.patch
 Patch50: e-smith-ldap-5.2.0-add_www_move_nobody.patch
 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
 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, perl(Net::LDAP)
+Requires: openldap >= 2.0.0
+Requires: openldap-clients
+Requires: perl(Net::LDAP)
 Requires: e-smith-formmagick >= 1.4.0-9
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -75,6 +82,27 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Sat Oct 30 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-56.sme
+- Fix a small typo in reset-ldap-bootstrap [SME: 6231]
+
+* Fri Oct 29 2010 Shad L. Lords <slords@mail.com> 5.2.0-55.sme
+- Add ldap.init script to allow update on reconfig/reboot [SME: 6231]
+
 * Thu Oct 28 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-54.sme
 - Fix minor errors in ldap-update [SME: 6312]
 
@@ -945,12 +973,17 @@ e-smith server and gateway software - LD
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -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/S80ldap
+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
@@ -963,6 +996,7 @@ touch root/var/service/ldap/down
 mkdir -p root/var/log/bdb
 mkdir -p root/var/log/ldap
 mkdir -p root/var/service/ldap/ssl
+mkdir -p root/etc/e-smith/ldap/init
 
 %install
 rm -rf $RPM_BUILD_ROOT