--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2009/01/28 04:04:18	1.12
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/30 19:19:19	1.16
@@ -1,16 +1,21 @@
-# $Id: e-smith-ldap.spec,v 1.11 2008/10/07 18:40:10 slords Exp $
+# $Id: e-smith-ldap.spec,v 1.15 2010/01/27 14:02:50 filippocarletti Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 2
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -24,6 +29,19 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Sun Feb  8 2009 Charlie Brady <charlie_brady@mitel.com> 5.2.0-3.sme
+- Create bdb log directory. [SME: 3018]
+
 * Tue Jan 27 2009 Charlie Brady <charlie_brady@mitel.com> 5.2.0-2.sme
 - Change ldap backend to bdb, and fix initialisation problem.
   [SME: 3018, 2859]
@@ -679,6 +697,11 @@ e-smith server and gateway software - LD
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -694,6 +717,9 @@ mkdir -p root/service
 ln -s /var/service/ldap root/service/ldap
 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
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -702,6 +728,8 @@ 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