--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/10/13 21:50:37	1.19
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/03/17 17:35:11	1.32
@@ -1,16 +1,25 @@
-# $Id: e-smith-samba.spec,v 1.18 2008/10/13 21:48:33 slords Exp $
+# $Id: e-smith-samba.spec,v 1.31 2010/03/06 16:03: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 2
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+Patch7: e-smith-samba-2.2.0-profilev2.patch
+Patch8: e-smith-samba-2.2.0-refactor-profilev2.patch
+Patch9: e-smith-samba-2.2.0-quote-manually.patch
+Patch10: e-smith-samba-2.2.0-fail-silently-on-non-existent-folder.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -21,9 +30,45 @@ Requires: e-smith-formmagick >= 1.4.0-9
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
 Requires: samba-common >= 3.0.25b
+Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Wed 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
+- Add dependency /usr/bin/tdbbackup [SME: 5851]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-12.sme
+- Add missing comma in previous patch [SME: 5821]
+- Silently skip non-existent profile folder [SME: 5821]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-11.sme
+- Properly quote the profile folders manually [SME: 5821]
+
+* Sat Mar 6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-10.sme
+- Rework V2 profile patch to fix error on user-delete event [SME: 5821]
+
+* Sun Feb 7 2010 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+- Create/remove V2 profile directories [SME: 3666]
+
+* 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]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Fix oslevel fragment for server roles [SME: 4730]
+
 * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
 - Add patch to support multiple samba roles [SME: 4172]
 
@@ -991,6 +1036,15 @@ Configuration files and templates for th
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests