--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/03 14:01:03	1.50
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/30 18:57:35	1.60
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.49 2010/11/02 19:49:18 slords Exp $
+# $Id: e-smith-samba.spec,v 1.59 2010/11/30 18:55:58 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 32
+%define release 39
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -35,6 +35,11 @@ Patch22: e-smith-samba-2.2.0-enable-cpu.
 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
+Patch27: e-smith-samba-2.2.0-usergroup-mapping.patch
+Patch28: e-smith-samba-2.2.0-fixe_create_machine_accounts.patch
+Patch29: e-smith-samba-2.2.0-force_uid_gid.patch
+Patch30: e-smith-samba-2.2.0-migrate_machine_uid.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -55,10 +60,31 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
-* Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net 2.2.0-32.sme
+* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2-0-39.sme
+- Migrate existing machine uid in the DB (patch from Shad Lords) [SME: 6415]
+
+* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-38.sme
+- Force uid/gid on machine accounts creation [SME: 6415]
+
+* Wed Nov 10 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-37.sme
+- Fix create-machine-accounts script [SME: 6358]
+
+* Fri Nov 5 2010 Shad L. Lords <slords@lordsfam.net> 2.2.0-36.sme
+- Call samba-group-mapping after user events too [SME: 6339]
+
+* Wed Nov 3 2010 Shad L. Lords <slords@lordsfam.net> 2.2.0-35.sme
+- Fix cpu critical patch missing ' [SME: 6330]
+
+* 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
+* 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
@@ -1139,6 +1165,11 @@ Configuration files and templates for th
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests