--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/02/03 09:54:11	1.23
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/05/04 16:24:26	1.33
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.21 2010/02/03 08:59:31 dungog Exp $
+# $Id: e-smith-ldap.spec,v 1.32 2010/04/30 15:30:36 filippocarletti Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 13
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,9 +17,14 @@ Patch3: %{name}-%{version}-password.patc
 Patch4: %{name}-%{version}-tls.patch
 Patch5: %{name}-%{version}-user-lock-event.patch
 Patch6: %{name}-%{version}-admin_user.patch
-Patch7: %{name}-%{version}-users_groups_ous.patch3
+Patch7: %{name}-%{version}-users_groups_ous.patch2
 Patch8: %{name}-%{version}-attributes.patch
 Patch9: %{name}-%{version}-mailboxRelatedObject.patch
+Patch10: %{name}-%{version}-force_ssl_tls_for_auth.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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -33,8 +38,32 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
-* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
-- Fix Groups entries [SME: 5743]
+* 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]
+
+* Thu Feb 4 2010 Daniel B. <daniel@firewall-services.com> 5.2.0-14.sme
+- Force SSL/TLS for remote authentication [SME: 5748]
+
+* Wed Feb 3 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
+- reuse users_groups_ous.patch2 [SME: 5743]
 
 * Wed Feb 3 2010 Stephen Noble <support@dungog.net> 5.2.0-12.sme
 - Separate groups and users with mailboxRelatedObject [SME:5749]
@@ -731,6 +760,11 @@ e-smith server and gateway software - LD
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests