--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/11/24 02:32:18	1.21
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/01/31 10:00:15	1.26
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.20 2008/10/28 23:12:19 slords Exp $
+# $Id: e-smith-samba.spec,v 1.25 2010/01/31 09:49:34 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 4
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,10 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-samba-2.2.0-sambaRole.patch
 Patch2: e-smith-samba-2.2.0-migratefix.patch
+Patch3: e-smith-samba-2.2.0-fixwarnings.patch
+Patch4: e-smith-samba-2.2.0-win7samba.patch
+Patch5: e-smith-samba-2.2.0-recylebin_perms.patch
+Patch6: e-smith-samba-2.2.0-enable-bind-interfaces.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -25,6 +29,19 @@ Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
+- Enable bindinterfaces by default [SME: 3325]
+
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 2.2.0-7.sme
+- Set recyle bin permissions [SME: 1734]
+
+* Sat Dec 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Add registry file to server-resources to allow windows 7 to 
+  join Samba 3.x domains [SME: 5425]
+
+* Tue Jun 2 2009 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Fix warnings in template expansion [SME: 5309]
+
 * Sun Nov 23 2008 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
 - Fix migrate fragments for samba [SME: 4777]
 
@@ -999,6 +1016,10 @@ Configuration files and templates for th
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests