--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/01/13 16:01:11	1.14
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/03/01 16:58:26	1.31
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.13 2009/02/09 00:00:30 charliebrady Exp $
+# $Id: e-smith-ldap.spec,v 1.30 2010/03/01 15:33:04 filippocarletti Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 4
+%define release 19
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,16 @@ Source: %{name}-%{version}.tar.gz
 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
+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
@@ -26,6 +36,51 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* 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]
+
+* 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]
+
+* 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]
@@ -690,6 +745,16 @@ e-smith server and gateway software - LD
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -706,6 +771,7 @@ ln -s /var/service/ldap root/service/lda
 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
@@ -715,6 +781,7 @@ rm -f %{name}-%{version}-%{release}-file
     --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