--- rpms/e-smith-samba+ldap/sme8/e-smith-samba+ldap.spec	2008/04/19 23:07:50	1.3
+++ rpms/e-smith-samba+ldap/sme8/e-smith-samba+ldap.spec	2008/10/08 12:05:34	1.8
@@ -1,17 +1,16 @@
+# $Id: e-smith-samba+ldap.spec,v 1.7 2008/10/07 19:20:43 slords Exp $
+
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba+ldap
 Name: %{name}
-%define version 1.15.1
-%define release 3
+%define version 2.2.0
+%define release 2
 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
+Patch1: e-smith-samba+ldap-2.0.0-dont_delete_dn.patch
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -28,6 +27,22 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* Wed Oct 8 2008 Daniel B. <daniel@firewall-services.com> 2.2.0-2
+- prevent samba to delete complete dn from ldap (ldap delete dn) [SME: 4638]
+
+* 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.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)
+
 * Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 1.15.1-3
 - Disable unix extensions. [SME: 4164]
 
@@ -996,9 +1011,6 @@ Configuration files and templates for th
 %prep
 %setup
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests