--- rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec	2008/04/22 21:07:22	1.4
+++ rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec	2008/10/07 19:20:43	1.7
@@ -1,18 +1,15 @@
+# $Id$
+
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba+ldap
 Name: %{name}
-%define version 1.15.1
-%define release 4
+%define version 2.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-samba-1.15.1-shadowfix.patch
-Patch2: e-smith-samba-1.15.1-hideprofile.patch
-Patch3: e-smith-samba-1.15.1-ldap.patch
-Patch4: e-smith-samba-1.14.1-unix_extensions.patch
-Patch5: e-smith-samba+ldap-1.15.1-machine_accounts_and_pass_sync.patch
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -29,6 +26,15 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Sun Aug  3 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.15.1-6
+- Fix oslevel template expansion. [SME: 4470]
+
+* Thu Jun 05 2008 Daniel B. <daniel@firewall-services.com> 1.15.1-5
+- use /etc/cpu-machine.conf to create machine accounts. [SME: 4396]
+
 * Tue Apr 22 2008 Daniel B. <daniel@firewall-services.com> 1.15.1-4
 - allow creation of machine accounts in ldap
 - sync samba passwords with ldap userPassword (replace unix password sync)
@@ -1000,11 +1006,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests