--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/10/02 10:55:33	1.42
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/03 18:23:05	1.53
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.41 2010/10/02 09:52:20 vip-ire Exp $
+# $Id: e-smith-samba.spec,v 1.52 2010/11/03 18:21:39 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 22
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,6 +28,14 @@ Patch15: e-smith-samba-2.2.0-slapd_suppo
 Patch16: e-smith-samba-2.2.0-lanman_password_as_an_option.patch
 Patch17: e-smith-samba-2.2.0-anonymous_acls.patch
 Patch18: e-smith-samba-2.2.0-add_sambasid_to_sensible_attrs.patch
+Patch19: e-smith-samba-2.2.0-samba_attr_no_output.patch
+Patch20: e-smith-samba-2.2.0-fix_limited_anon_access.patch
+Patch21: e-smith-samba-2.2.0-fix_modify.patch
+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
@@ -48,6 +56,42 @@ 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: 6332]
+
+* 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]
+
+* Mon Nov 1 2010 Shad L. Lords <slords@mail.com> 2.2.0-28.sme
+- Auth against ldap if it is master [SME: 6321]
+
+* Mon Nov 1 2010 Shad L. Lords <slords@mail.com> 2.2.0-27.sme
+- Change the way groups are modified on samba3x [SME: 6314]
+
+* Wed Oct 27 2010 Shad L. Lords <slords@mail.com> 2.2.0-26.sme
+- Change the way groups are modified on samba3x [SME: 6314]
+
+* Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-25.sme
+- Fix anonymous access [SME: 6254]
+
+* Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 2.2.0-24.sme
+- Fix moving secrets.tdb file [SME: 6057]
+
+* Sat Oct 2 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-23.sme
+- Empty output when listing sensible attribtues [SME: 6254]
+
 * Sat Oct 2 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-22.sme
 - Add sambaSID to the list of sensible attributes [SME: 6254]
 
@@ -1095,6 +1139,14 @@ Configuration files and templates for th
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1177,7 +1229,10 @@ then
 fi
 chown -R smelog.smelog /var/log/{smbd,nmbd}
 # Move back secrets.tdb to private dir
-[ -f /var/lib/samba/private/secrets.tdb ] && mv -f /var/lib/samba/private/secrets.tdb /etc/samba || :
+if [ -f /var/lib/samba/private/secrets.tdb ]
+then
+    mv -f /var/lib/samba/private/secrets.tdb /etc/samba
+fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)