--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2011/03/16 08:17:28	1.64
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2013/03/20 03:29:14	1.75
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.63 2011/03/12 19:29:18 wellsi Exp $
+# $Id: e-smith-samba.spec,v 1.74 2013/03/18 04:09:16 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 42
+%define release 53
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -42,7 +42,10 @@ Patch29: e-smith-samba-2.2.0-force_uid_g
 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
-Patch33: e-smith-samba-2.2.0-exclude_dir-for-directories-only.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
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -59,11 +62,53 @@ 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
-Requires: /usr/bin/tdbbackup
+# Obsolete SerNet packages
+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
-* Wed Mar 15 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-42.sme
+* 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]
+
+* 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
@@ -1184,7 +1229,11 @@ Configuration files and templates for th
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+
 
 %build
 mkdir -p root/etc/e-smith/tests
@@ -1247,6 +1296,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