--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/31 05:41:37	1.18
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/03/01 15:33:04	1.30
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.16 2010/01/30 19:19:19 snetram Exp $
+# $Id: e-smith-ldap.spec,v 1.29 2010/02/09 11:42:54 filippocarletti Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 8
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,9 +15,14 @@ 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
+Patch5: %{name}-%{version}-user-lock-event.patch
 Patch6: %{name}-%{version}-admin_user.patch
-Patch7: %{name}-%{version}-users_groups_ous.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -31,6 +36,36 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Mon Mar  1 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-18.sme
+- Fix admin user password change (Daniel B.) [SME: 5742]
+
+* 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]
+
+* Wed Feb 3 2010 Stephen Noble <support@dungog.net> 5.2.0-11.sme
+- Set readonly access [SME:5752]
+
+* 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]
 
@@ -712,6 +747,11 @@ e-smith server and gateway software - LD
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests