--- rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/02/21 23:10:09	1.3
+++ rpms/e-smith-samba/sme9/e-smith-samba.spec	2013/05/25 04:36:30	1.9
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.2 2013/02/02 21:27:32 slords Exp $
+# $Id: e-smith-samba.spec,v 1.8 2013/05/25 04:07:40 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 3
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,10 @@ 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
+Patch6: e-smith-samba-2.4.0-40MachineUid.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -26,6 +30,7 @@ Obsoletes: samba3x
 Obsoletes: samba3x-client
 Obsoletes: samba3x-common
 Obsoletes: samba3x-winbind
+Obsoletes: libsmbclient <= 3.0.33
 # Obsolete SerNet packages
 Obsoletes: libsmbclient0
 Obsoletes: libwbclient0
@@ -39,6 +44,21 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Fri May 24 2013 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Remove 40MachineUID as not needed after e-smith-samba-2.2.0-38 [SME: 7608]
+
+* 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]
 
@@ -265,7 +285,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]
@@ -1163,6 +1183,10 @@ Configuration files and templates for th
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks