--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2007/12/15 19:32:11	1.10
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/10/07 19:19:52	1.17
@@ -1,26 +1,49 @@
+# $Id$
+
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
-%define version 1.14.1
-%define release 2
+%define version 2.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-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: e-smith-formmagick >= 1.4.0-9
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
 Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Sun Aug  3 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.1-8
+- Fix oslevel template expansion. [SME: 4470]
+
+* Thu Apr  3 2008 Charlie Brady <charlieb@e-smith.com> 1.14.1-7
+- Disable unix extensions. [SME: 4164]
+
+* Fri Mar 21 2008 Shad L. Lords <slords@mail.com> 1.14.1-6
+- Hide normally hidden profile files [SME: 4082]
+
+* Thu Mar 13 2008 Shad L. Lords <slords@mail.com> 1.14.1-5
+- Fix shadowcopy with < 2 ibays/users [SME: 3862]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.14.1-4
+- Remove <base> tags now in general [SME: 3925]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.14.1-3
+- Allow browsable to be disabled per ibay [SME: 2966]
+
 * Sat Dec 15 2007 Shad L. Lords <slords@mail.com> 1.14.1-2
 - Only create admin group if Domain Admins exists [SME: 3646]
 
@@ -963,7 +986,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch1 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests