--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/02 16:57:29	1.47
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/03 18:21:39	1.52
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.46 2010/10/27 21:33:21 slords Exp $
+# $Id: e-smith-samba.spec,v 1.51 2010/11/03 17:56:50 vip-ire Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 29
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -34,6 +34,8 @@ Patch21: e-smith-samba-2.2.0-fix_modify.
 Patch22: e-smith-samba-2.2.0-enable-cpu.patch
 Patch23: e-smith-samba-2.2.0-ldap-auth.patch
 Patch24: e-smith-samba-2.2.0-remove-domains.patch
+Patch25: e-smith-samba-2.2.0-better-ldap.patch
+Patch26: e-smith-samba-2.2.0-store_ldap_pw.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -54,6 +56,21 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Wed Nov 3 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-34.sme
+- rename store-ldap-passwd and link it in other events [SME: 6232]
+
+* Wed Nov 3 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-33.sme
+- Store the ldap admin pw early in the bootstrap-ldap-save event [SME: 6332]
+
+* Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 2.2.0-32.sme
+- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
+
+* Tue Nov 2 2010 Shad L. Lords <slords@lordsfam.net 2.2.0-31.sme
+- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6321]
+
+* Tue Nov 2 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-30.sme
+- Fix a typo in create-machine-account [SME: 6321]
+
 * Tue Nov 2 2010 Shad L. Lords <slords@mail.com> 2.2.0-29.sme
 - Clean up old domain entries when using ldap [SME: 6322]
 
@@ -1128,6 +1145,8 @@ Configuration files and templates for th
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests