--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2007/10/11 14:39:15	1.3
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2007/12/14 18:43:45	1.7
@@ -2,7 +2,7 @@ Summary: e-smith specific Samba configur
 %define name e-smith-samba
 Name: %{name}
 %define version 1.14.0
-%define release 31
+%define release 35
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -34,6 +34,11 @@ Patch22: e-smith-samba-1.14.0-runit17.pa
 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
+Patch29: e-smith-samba-1.14.0-domaingroups.patch
+Patch30: e-smith-samba-1.14.0-sambapam.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -46,6 +51,20 @@ Requires: samba-common
 AutoReqProv: no
 
 %changelog
+* Fri Dec 14 2007 Shad L. Lords <slords@mail.com> 1.14.0-35
+- Expand smb.conf in group events to complete #33 [SME: 3495]
+- Add rid to groupmap command to fix 3.0.25b groupmap [SME: 3644]
+- Add pam.d/samba to fix broken upstream package [SME: 3641]
+
+* 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]
 
@@ -991,6 +1010,11 @@ Configuration files and templates for th
 %patch23 -p1
 #%patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests