--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2011/12/23 21:28:16	1.68
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2013/03/18 04:09:16	1.74
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.67 2011/03/17 21:00:11 snetram Exp $
+# $Id: e-smith-samba.spec,v 1.73 2013/02/13 05:04:07 wellsi Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 46
+%define release 52
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -43,6 +43,10 @@ Patch30: e-smith-samba-2.2.0-migrate_mac
 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
+Patch35: e-smith-samba-2.2.0-tdbbackup12.patch
+Patch36: e-smith-samba-2.2.0-samba_audit.patch
+Patch37: e-smith-samba-2.2.0-samba_audit_log.patch
+Patch38: e-smith-samba-2.2.0-WaitForNetwork.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -60,21 +64,36 @@ 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
+Obsoletes: libsmbclient0
+Obsoletes: libwbclient0
+Obsoletes: samba3
+Obsoletes: samba3-cifsmount
+Obsoletes: samba3-client
+Obsoletes: samba3-doc
+Obsoletes: samba3-utils
+Obsoletes: samba3-winbind
+Requires: /usr/bin/tdbbackup12
 AutoReqProv: no
 
 %changelog
+* Tue Feb 12 2013 Ian Wells <esmith@wellsi.com> 2.2.0-52.sme
+- Add ability to configure waiting for network Win7 registry option [SME: 7332]
+
+* Tue Feb 12 2013 Ian Wells <esmith@wellsi.com> 2.2.0-51.sme
+- Remove samba_audit specific loglotate configuration [SME: 7335]
+
+* Mon Jan 21 2013 Ian Wells <esmith@wellsi.com> 2.2.0-50.sme
+- Enable smb auditing per ibay [SME: 6176]
+
+* Thu Jan 17 2013 Shad L. Lords <slords@mail.com> 2.2.0-49.sme
+- Update dependency to /usr/bin/tdbbackup12 [SME: 7210]
+
+* Sun Jan 29 2012 Ian Wells <esmith@wellsi.com> 2.2.0-48.sme
+- Obsolete only SerNet samba packages [SME: 6772]
+
+* Sat Jan 21 2012 Ian Wells <esmith@wellsi.com> 2.2.0-47.sme
+- Obsolete SerNet samba packages, again [SME: 6772]
+
 * Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-46.sme
 - Obsolete SerNet samba packages [SME: 6772]
 
@@ -1209,6 +1228,10 @@ Configuration files and templates for th
 %patch31 -p1
 %patch32 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1271,6 +1294,9 @@ then
     rmdir /home/netlogon || echo "Couldn't rmdir /home/netlogon"
 fi
 
+# Remove logrotate configuration for samba_audit
+rm -f /etc/logrotate.d/samba_audit
+
 # Revert to canonical place for smb.conf
 if [ -f /etc/smb.conf ]
 then