--- rpms/e-smith-samba/sme7/e-smith-samba.spec	2008/11/24 02:32:18	1.20
+++ rpms/e-smith-samba/sme7/e-smith-samba.spec	2011/03/17 21:15:27	1.30
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.19 2008/10/28 23:12:19 slords Exp $
+# $Id: e-smith-samba.spec,v 1.29 2011/03/16 08:45:24 snetram Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.0.0
-%define release 4
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,11 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-samba-2.0.0-sambaRole.patch
 Patch2: e-smith-samba-2.0.0-migratefix.patch
+Patch3: e-smith-samba-2.0.0-fixwarnings.patch
+Patch4: e-smith-samba-2.0.0-win7samba.patch
+Patch5: e-smith-samba-2.0.0-profile_V2.patch
+Patch6: e-smith-samba-2.0.0-FixVFS_ExcludeSyntax.patch
+Patch8: e-smith-samba-2.0.0-fix-separator.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -25,6 +30,28 @@ Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Thu Mar 17 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-11.sme
+- Revert changes made in 2.0.0-9 [SME: 6378]
+
+* Tue Mar 15 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-10.sme
+- Fix separator in general smb.conf section for recycle:exclude* [SME: 6570]
+
+* Tue Mar 15 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-9.sme
+- recycle:exclude_dir should contain directories [SME: 6378]
+
+* Sat Mar 12 2011 Gavin Weight <gweight@gmail.com> 2.0.0-8.sme
+- Fix Recycle Bin VFS Excludes syntax. [SME: 6378]
+
+* Fri Mar 4 2011 Shad L. Lords <slords@mail.com> 2.0.0-7.sme
+- Create .V2 profiles for vista/7 [SME: 5423]
+
+* Sun Dec 27 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-6.sme
+- Add registry file to server-resources to allow windows 7 to
+  join Samba 3.x domains [SME: 5423]
+
+* Tue Jun 2 2009 Shad L. Lords <slords@mail.com> 2.0.0-5.sme
+- Fix warnings in template expansion [SME: 4954]
+
 * Sun Nov 23 2008 Shad L. Lords <slords@mail.com> 2.0.0-4.sme
 - Fix migrate fragments for samba [SME: 4777]
 
@@ -999,6 +1026,11 @@ Configuration files and templates for th
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch8 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests