--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/02/05 12:39:07	1.27
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/09/22 14:45:12	1.36
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.26 2010/02/04 11:37:22 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.35 2010/06/10 19:55:29 snetram Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 15
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,7 +21,13 @@ Patch7: %{name}-%{version}-users_groups_
 Patch8: %{name}-%{version}-attributes.patch
 Patch9: %{name}-%{version}-mailboxRelatedObject.patch
 Patch10: %{name}-%{version}-force_ssl_tls_for_auth.patch
-Patch11: %{name}-%{version}-reinit.patch
+Patch11: %{name}-%{version}-sme8b-db.patch
+Patch12: %{name}-%{version}-admin_user2.patch
+Patch13: %{name}-%{version}-ibay_password.patch
+Patch14: %{name}-%{version}-fix-indention.patch
+Patch15: %{name}-%{version}-email-domain-change.patch
+Patch16: %{name}-%{version}-update-admin.patch
+Patch17: %{name}-%{version}-empty_group.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -35,6 +41,34 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Wed Sep 22 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-24.sme
+- Restrict access to the ldif file [SME: 6217]
+
+* Tue Jun 10 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
+- Fix ldap-create errors when adding empty groups [SME: 5920]
+
+* Mon Jun  7 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-22.sme
+- Update email addresses on domain change (thanks Daniel) [SME: 5984]
+- Update admin information (thanks Daniel) [SME: 6014]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-21.sme
+- Fix indentation in S25ldap-update script [SME: 5914]
+
+* Fri Apr 30 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-20.sme
+- Don't try to save ibay password to ldap [SME: 5906]
+
+* Mon Mar  1 2010 Daniel B. <daniel@firewall-services.com> 5.2.0-19.sme
+- Fix bug reference in spec file
+
+* Mon Mar  1 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-18.sme
+- Fix admin user password change (Daniel B.) [SME: 5810]
+
+* Tue Feb  9 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-17.sme
+- Init database if the ldif dump is empty (ie from sme8b) [SME: 5747]
+
+* Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-16.sme
+- revert re-init database [SME:5747]
+
 * Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-15.sme
 - re-init readonly database on post-upgrade [SME:5747]
 
@@ -741,6 +775,12 @@ e-smith server and gateway software - LD
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -769,6 +809,7 @@ rm -f %{name}-%{version}-%{release}-file
     --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)' \
+    --dir /home/e-smith/db/ldap 'attr(0750,root,ldap)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist