--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2008/07/25 21:21:16	1.8
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/02/01 02:08:27	1.20
@@ -1,22 +1,23 @@
+# $Id: e-smith-ldap.spec,v 1.18 2010/01/31 05:41:37 dungog 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 10
 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
+Patch5: %{name}-%{version}-user-lock-event.patch
+Patch6: %{name}-%{version}-admin_user.patch
+Patch7: %{name}-%{version}-users_groups_ous.patch2
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -30,16 +31,51 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
-* Fri Jul 25 2008 Shad L. Lords <slords@mail.com> 1.12.0-11
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-10.sme
+- Fix ldap-update action script to user-lock event [SME: 5720]
+
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-9.sme
+- Fix Groups entries [SME: 5743]
+
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-8.sme
+- Add Groups entries [SME: 5743]
+
+* 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]
+
+* 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]
 
-* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-10
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.12.0-10
 - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
 
 * Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 4.12.0-9
 - Add free/busy URL entry to help kronolith contribs [SME: 1806]
 
-* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.12.0-8
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.12.0-8
 - Remove <base> tags now in general [SME: 3919]
 
 * Tue Jun 26 2007 Charlie Brady <charlie_brady@mitel.com>
@@ -682,7 +718,6 @@ e-smith server and gateway software - LD
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -698,13 +733,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