--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2012/01/22 02:57:36	1.69
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2013/04/26 06:48:14	1.77
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.68 2011/12/23 21:28:16 snetram Exp $
+# $Id: e-smith-samba.spec,v 1.76 2013/04/26 06:34:47 burnat Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.2.0
-%define release 47
+%define release 54
 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,10 +64,7 @@ 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
-Obsoletes: libsmbclient-devel
 Obsoletes: libsmbclient0
-Obsoletes: libwbclient-devel
 Obsoletes: libwbclient0
 Obsoletes: samba3
 Obsoletes: samba3-cifsmount
@@ -71,10 +72,31 @@ Obsoletes: samba3-client
 Obsoletes: samba3-doc
 Obsoletes: samba3-utils
 Obsoletes: samba3-winbind
-Requires: /usr/bin/tdbbackup
+Requires: /usr/bin/tdbbackup12
 AutoReqProv: no
 
 %changelog
+* Fri Apr 26 2013 chris burnat <devlist@burnat.com> 2.2.0-54.sme
+- Add ability to configure waiting for network Win7 registry option, patch from Greg. [SME: 7332]
+
+* Wed Mar 19 2013 Ian Wells <esmith@wellsi.com> 2.2.0-53.sme
+- Revert previous change. [SME: 7332]
+
+* 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]
 
@@ -1212,6 +1234,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
@@ -1274,6 +1300,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