--- rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/02/02 21:27:32	1.2
+++ rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/05/25 04:07:40	1.8
@@ -1,16 +1,20 @@
-# $Id: e-smith-samba.spec,v 1.1 2013/02/02 21:06:11 slords Exp $
+# $Id: e-smith-samba.spec,v 1.7 2013/05/22 04:02:24 wellsi Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.4.0
-%define release 2
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch1: e-smith-samba-2.4.0-tdbbackup.patch
+Patch2: e-smith-samba-2.4.0-samba_audit_log.patch
+Patch3: e-smith-samba-2.4.0-workgroup.patch
+Patch4: e-smith-samba-2.4.0-WaitForNetwork.patch
+Patch5: e-smith-samba-2.4.0-smbServerName.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -25,6 +29,7 @@ Obsoletes: samba3x
 Obsoletes: samba3x-client
 Obsoletes: samba3x-common
 Obsoletes: samba3x-winbind
+Obsoletes: libsmbclient <= 3.0.33
 # Obsolete SerNet packages
 Obsoletes: libsmbclient0
 Obsoletes: libwbclient0
@@ -38,6 +43,21 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Tue May 21 2013 Ian Wells <esmith@wellsi.com> 2.4.0-7.sme
+- Update default ServerName in 30smbServerName [SME: 7609]
+
+* Mon Apr 29 2013 chris burnat <devlist@burnat.com> 2.4.0-6.sme
+- Add ability to configure waiting for network Win7 registry option, patch from Greg. [SME: 7566]
+
+* Thu Mar 14 2013 Ian Wells <esmith@wellsi.com> 2.4.0-5.sme
+- Change default Workgroup and Domain to sme-server [SME: 7482]
+
+* Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-4.sme
+- Obsolete el5 version of libsmbclient [SME: 7273]
+
+* Thu Feb 21 2013 Ian Wells <esmith@wellsi.com> 2.4.0-3.sme
+- Remove samba_audit specific loglotate configuration [SME: 7388]
+
 * Sat Feb 2 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
 - Change tdbbackup12 back to tdbbackup
 
@@ -261,7 +281,7 @@ AutoReqProv: no
   [SME: 2400]
 
 * Fri Jan 26 2007 Shad L. Lords <slords@mail.com> 1.14.0-25
-- Set ServerName to SystemName after inital configuration [SME: 543]
+- Set ServerName to SystemName after inital configuration [SME: 2378]
 
 * Thu Jan 25 2007 Shad L. Lords <slords@mail.com> 1.14.0-24
 - Allow oplocks to be disabled per ibay [SME: 543]
@@ -1158,6 +1178,10 @@ Configuration files and templates for th
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks