--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/13 16:01:11	1.14
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/31 05:34:48	1.17
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.13 2009/02/09 00:00:30 charliebrady Exp $
+# $Id: e-smith-ldap.spec,v 1.16 2010/01/30 19:19:19 snetram Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,10 @@ Source: %{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}.backend
 Patch1: %{name}-%{version}-schema.patch
 Patch2: %{name}-%{version}-convert_ldif.patch
+Patch3: %{name}-%{version}-password.patch
+Patch4: %{name}-%{version}-tls.patch
+Patch5: %{name}-%{version}-ldap-update-link-in-user-lock-event.patch
+Patch6: %{name}-%{version}-admin_user.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -26,6 +30,15 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-7.sme
+- Add admin user as a standard user [SME: 5742]
+
+* Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-6.sme
+- Add ldap-update action script to user-lock event [SME: 5720]
+
+* Wed Jan 27 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-5.sme
+- Add ldap authentication and tls support [SME: 5720]
+
 * Wed Jan 13 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-4.sme
 - Update schema for newer openldap and remove calFBurl [SME: 5159]
 - Convert ldif dump [SME: 5446]
@@ -690,6 +703,10 @@ e-smith server and gateway software - LD
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -706,6 +723,7 @@ ln -s /var/service/ldap root/service/lda
 touch root/var/service/ldap/down
 
 mkdir -p root/var/log/bdb
+mkdir -p root/var/service/ldap/ssl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -715,6 +733,7 @@ rm -f %{name}-%{version}-%{release}-file
     --file /var/service/ldap/run 'attr(0750,root,root)' \
     --file /var/service/ldap/convert_ldif '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)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist