--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2010/11/30 22:09:40	1.61
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2011/12/23 21:28:16	1.68
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.60 2010/11/30 18:57:35 vip-ire Exp $
+# $Id: e-smith-samba.spec,v 1.67 2011/03/17 21:00:11 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 40
+%define release 46
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -41,6 +41,8 @@ Patch28: e-smith-samba-2.2.0-fixe_create
 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
@@ -57,14 +59,44 @@ Obsoletes: samba-common <= 3.1.0
 Obsoletes: samba = 3.4.3-1.1.el5.sme
 Obsoletes: samba-client = 3.4.3-1.1.el5.sme
 Obsoletes: samba-common = 3.4.3-1.1.el5.sme
+# Obsolete SerNet packages
+Obsoletes: ldb-tools = 3.5.11-44.el4
+Obsoletes: libsmbclient-devel = 3.5.11-44.el4
+Obsoletes: libsmbclient0 = 3.5.11-44.el4
+Obsoletes: libwbclient-devel = 3.5.11-44.el4
+Obsoletes: libwbclient0 = 3.5.11-44.el4
+Obsoletes: samba3 = 3.5.11-44.el4
+Obsoletes: samba3-cifsmount = 3.5.11-44.el4
+Obsoletes: samba3-client = 3.5.11-44.el4
+Obsoletes: samba3-doc = 3.5.11-44.el4
+Obsoletes: samba3-utils = 3.5.11-44.el4
+Obsoletes: samba3-winbind = 3.5.11-44.el4
 Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
-* Tue Nov 30 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2-0-40.sme
+* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-46.sme
+- Obsolete SerNet samba packages [SME: 6772]
+
+* 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
+* 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
@@ -1175,6 +1207,8 @@ Configuration files and templates for th
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
+%patch34 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests