--- rpms/e-smith-samba/sme8/e-smith-samba.spec	2008/04/12 16:17:49	1.15
+++ rpms/e-smith-samba/sme8/e-smith-samba.spec	2009/12/26 08:54:02	1.23
@@ -1,25 +1,25 @@
+# $Id: e-smith-samba.spec,v 1.22 2009/06/02 13:58:27 slords Exp $
+
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
-%define version 1.14.1
-%define release 7
+%define version 2.2.0
+%define release 6
 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
-Patch4: e-smith-samba-1.14.1-shadowfix.patch
-Patch5: e-smith-samba-1.14.1-hideprofile.patch
-Patch6: e-smith-samba-1.14.1-unix_extensions.patch
+Patch1: e-smith-samba-2.2.0-sambaRole.patch
+Patch2: e-smith-samba-2.2.0-migratefix.patch
+Patch3: e-smith-samba-2.2.0-fixwarnings.patch
+Patch4: e-smith-samba-2.2.0-win7samba.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-lib >= 2.2.0-2
 Requires: e-smith-formmagick >= 1.4.0-9
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
@@ -27,6 +27,28 @@ Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Sat Dec 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Add registry file to server-resources to allow windows 7 to 
+  join Samba 3.x domains [SME: 5425]
+
+* Tue Jun 2 2009 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Fix warnings in template expansion [SME: 5309]
+
+* Sun Nov 23 2008 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
+- Fix migrate fragments for samba [SME: 4777]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Fix oslevel fragment for server roles [SME: 4730]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
+* 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]
 
@@ -988,8 +1010,6 @@ Configuration files and templates for th
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests