--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/02/13 22:51:46	1.12
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/10/07 19:19:52	1.17
@@ -1,17 +1,15 @@
+# $Id$
+
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
-%define version 1.14.1
-%define release 4
+%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
-Patch2: e-smith-samba-1.14.1-browsable.patch
-Patch3: e-smith-samba-1.14.1-tags2general.patch
-
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -25,6 +23,21 @@ 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]
 
@@ -973,9 +986,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests