--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2008/09/16 18:36:12	1.8.2.1
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/27 14:02:50	1.15
@@ -1,22 +1,20 @@
+# $Id: e-smith-ldap.spec,v 1.14 2010/01/13 16:01:11 filippocarletti Exp $
+
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
-%define version 4.12.0
-%define release 11
+%define version 5.2.0
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-ldap-4.12.0-noipv6.patch
-Patch1: e-smith-ldap-4.12.0-slapd.conf.perms.patch
-Patch2: e-smith-ldap-4.12.0-success.patch
-Patch3: e-smith-ldap-4.12.0-pid_args_files.patch
-Patch4: e-smith-ldap-4.12.0-objectClass.patch
-Patch5: e-smith-ldap-4.12.0-tags2general.patch
-Patch6: e-smith-ldap-4.12.0-freebusy.patch
-Patch7: e-smith-ldap-4.12.0-add2general.patch
-Patch8: e-smith-ldap-4.12.0-2739schema.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -30,6 +28,26 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.13.0-1
+- Roll new dev stream.
+
 * Fri Jul 25 2008 Shad L. Lords <slords@mail.com> 4.12.0-11
 - Separate template to avoid breaking schema [SME: 4171]
 
@@ -679,10 +697,6 @@ e-smith server and gateway software - LD
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -698,13 +712,19 @@ 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)
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --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