--- rpms/e-smith-samba/sme7/e-smith-samba.spec	2007/06/12 16:12:59	1.1
+++ rpms/e-smith-samba/sme7/e-smith-samba.spec	2007/11/30 18:13:51	1.6
@@ -2,7 +2,7 @@ Summary: e-smith specific Samba configur
 %define name e-smith-samba
 Name: %{name}
 %define version 1.14.0
-%define release 29
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -33,6 +33,10 @@ Patch21: e-smith-samba-1.14.0-net_full_p
 Patch22: e-smith-samba-1.14.0-runit17.patch
 Patch23: e-smith-samba-1.14.0-printerdrivershare.patch
 Patch24: e-smith-samba-1.14.0-minlength.patch
+Patch25: e-smith-samba-1.14.0-printer_tdb_delete.patch
+Patch26: e-smith-samba-1.14.0-delete_smbpasswd.patch
+Patch27: e-smith-samba-1.14.0-adminusers.patch
+Patch28: e-smith-samba-1.14.0-RemovePrinterAdminTemplate.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -45,6 +49,21 @@ Requires: samba-common
 AutoReqProv: no
 
 %changelog
+* Fri Nov 30 2007 Gavin Weight <gweight@gmail.com> 1.14.0-34
+- Removed printer admin template. [SME: 3605]
+
+* Fri Oct 26 2007 Shad L. Lords <slords@mail.com> 1.14.0-33
+- Add "Domain Admins" to admin users [SME: 3495]
+
+* Thu Oct 11 2007 Charlie Brady <charlie_brady@mitel.com> 1.14.0-32
+- Delete smbpasswd file prior to restore. [SME: 2313]
+
+* Wed Oct 10 2007 Charlie Brady <charlie_brady@mitel.com> 1.14.0-31
+- Delete printer tdb file on printer delete. [SME: 3336]
+
+* Thu Jun 2 2007 Shad L. Lords <slords@mail.com> 1.14.0-30
+- revert last change.  Breaks sme8 and is caught by pass check lib.
+
 * Sat Jun 2 2007 Shad L. Lords <slords@mail.com> 1.14.0-29
 - pam_unix requires passwords >= 6 [SME: 3039]
 
@@ -982,7 +1001,11 @@ Configuration files and templates for th
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
+#%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests