--- rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/03/15 05:25:33	1.5
+++ rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/05/25 04:07:40	1.8
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.4 2013/03/11 18:16:53 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 5
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,8 @@ 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
@@ -41,6 +43,12 @@ 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]
 
@@ -273,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]
@@ -1172,6 +1180,8 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks