--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/11/30 18:06:09	1.81
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2011/03/14 15:27:20	1.88
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.80 2010/11/30 10:43:14 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.87 2010/12/02 00:46: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 69
+%define release 75
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -73,6 +73,11 @@ Patch59: e-smith-ldap-5.2.0-locked-passw
 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
+Patch66: e-smith-ldap-5.2.0-replace-logic.patch
+Patch67: e-smith-ldap-5.2.0-dont_set_gecos_in_ldap.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -88,6 +93,26 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Mon Mar 14 2011 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-75.sme
+- Stop using gecos attribute in LDAP [SME: 6539]
+
+* Wed Dec 1 2010 Shad L. Lords <slord@mail.com> 5.2.0-74.sme
+- Fix replace logic in ldif-fix [SME: 6423]
+
+* 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]
+
+* 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]
 
@@ -1014,6 +1039,11 @@ e-smith server and gateway software - LD
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1039,7 +1069,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)' \