--- rpms/e-smith-samba/sme7/e-smith-samba.spec	2008/10/07 19:19:52	1.17
+++ rpms/e-smith-samba/sme7/e-smith-samba.spec	2011/03/16 08:32:24	1.27
@@ -1,21 +1,28 @@
-# $Id$
+# $Id: e-smith-samba.spec,v 1.26 2011/03/16 08:14:53 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 1
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+Patch7: e-smith-samba-2.0.0-exclude_dir-for-directories-only.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-regedit
-Requires: e-smith-lib >= 1.16.0-10
+Requires: e-smith-lib >= 2.0.0-2
 Requires: e-smith-formmagick >= 1.4.0-9
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
@@ -23,6 +30,31 @@ Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Wed 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]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.0.0-3.sme
+- Fix oslevel fragment for server roles [SME: 4730]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.0.0-2.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -986,6 +1018,13 @@ Configuration files and templates for th
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+#%patch7 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests