--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/14 16:46:46	1.57
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2011/03/17 21:00:11	1.67
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.56 2010/11/10 18:51:10 vip-ire Exp $
+# $Id: e-smith-samba.spec,v 1.66 2011/03/17 20:47:58 snetram Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 37
+%define release 45
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -38,6 +38,11 @@ Patch25: e-smith-samba-2.2.0-better-ldap
 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
+Patch31: e-smith-samba-2.2.0-create_samba_data_in_event.patch
+Patch32: e-smith-samba-2.2.0-FixVFS_ExcludeSyntax.patch
+Patch34: e-smith-samba-2.2.0-fix-separator.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -58,6 +63,30 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Thu Mar 17 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-45.sme
+- Revert directory requirement from 2.2.0-43 [SME: 6571]
+
+* Thu Mar 17 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-44.sme
+- Revert changes made in 2.2.0-42 [SME: 6432]
+
+* Tue Mar 15 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-43.sme
+- Fix separator in general smb.conf section for recycle:exclude* [SME: 6571]
+
+* Tue Mar 15 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-42.sme
+- recycle:exclude_dir should contain directories [SME: 6432]
+
+* Sat Mar 12 2011 Gavin Weight <gweight@gmail.com> 2.2.0-41.sme
+- Fix Recycle Bin VFS Excludes syntax. [SME: 6432]
+
+* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-40.sme
+- Create samba account during event for machine [SME: 6418]
+
+* 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]
 
@@ -1160,6 +1189,11 @@ Configuration files and templates for th
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch34 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests