--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2007/11/30 18:13:51	1.6
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2007/12/15 19:32:11	1.10
@@ -1,54 +1,40 @@
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
-%define version 1.14.0
-%define release 34
+%define version 1.14.1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-samba-1.14.0-PrinterAddDelete.patch
-Patch1: e-smith-samba-1.14.0-migrate.patch
-Patch2: e-smith-samba-1.14.0-smbdSFlag.patch 
-Patch3: e-smith-samba-1.14.0-samba-check-password.patch
-Patch4: e-smith-samba-1.14.0-samba-check-password.patch2
-Patch5: e-smith-samba-1.14.0-getlocalsid.patch
-Patch6: e-smith-samba-1.14.0-SMBPorts.patch
-Patch7: e-smith-samba-1.14.0-smb.conf.patch
-Patch8: e-smith-samba-1.14.0-user_group_map.patch
-Patch9: e-smith-samba-1.14.0-getlocalsid.patch2
-Patch10: e-smith-samba-1.14.0-samba-check-password.patch3
-Patch11: e-smith-samba-1.14.0-logondrive.patch
-Patch12: e-smith-samba-1.14.0-tdbbackup.patch
-Patch13: e-smith-samba-1.14.0-vfs_rework.patch
-Patch14: e-smith-samba-1.14.0-workgroupnum.patch
-Patch15: e-smith-samba-1.14.0-success.patch
-Patch16: e-smith-samba-1.14.0-shadowcopy.patch
-Patch17: e-smith-samba-1.14.0-shadowcopy.patch2
-Patch18: e-smith-samba-1.14.0-cscpolicy.patch
-Patch19: e-smith-samba-1.14.0-ibayoplocks.patch
-Patch20: e-smith-samba-1.14.0-setname.patch
-Patch21: e-smith-samba-1.14.0-net_full_path.patch
-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
+Patch1: e-smith-samba-1.14.1-admingroup.patch
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-regedit
 Requires: e-smith-lib >= 1.16.0-10
-Requires: samba
-Requires: samba-client
-Requires: samba-common
+Requires: samba >= 3.0.25b
+Requires: samba-client >= 3.0.25b
+Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Sat Dec 15 2007 Shad L. Lords <slords@mail.com> 1.14.1-2
+- Only create admin group if Domain Admins exists [SME: 3646]
+
+* Sat Dec 15 2007 Shad L. Lords <slords@mail.com> 1.14.1-1
+- Roll new tarball and bump version for 3.0.25b version [SME: 3495]
+
+* Fri Dec 14 2007 Shad L. Lords <slords@mail.com> 1.14.0-36
+- admin user no longer needed in 3.0.25 [SME: 3645]
+
+* 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]
 
@@ -977,35 +963,7 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch0 -p1 
-%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-%patch5 -p1 
-%patch6 -p1 
-%patch7 -p1 
-%patch8 -p1 
-%patch9 -p1 
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-#%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
+%patch1 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests