--- rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec	2008/08/03 09:40:17	1.6
+++ rpms/e-smith-samba+ldap/sme7/e-smith-samba+ldap.spec	2008/10/13 21:48:53	1.10
@@ -1,27 +1,25 @@
+# $Id: e-smith-samba+ldap.spec,v 1.9 2008/10/08 14:16:21 vip-ire 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 6
+%define version 2.0.0
+%define release 4
 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
-Patch6: e-smith-samba+ldap-1.15.1-merge_users_and_people.patch
-Patch7: e-smith-samba-1.15.1-osLevel.patch
+Patch1: e-smith-samba+ldap-2.0.0-dont_delete_dn.patch
+Patch2: e-smith-samba+ldap-2.0.0-update_domain_map_order.patch
+Patch3: e-smith-samba+ldap-2.0.0-sambaRole.patch
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 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.0.0-2
 Requires: e-smith-formmagick >= 1.4.0-9
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
@@ -31,6 +29,19 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.0.0-4.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
+* Wed Oct 8 2008 Daniel B. <daniel@firewall-services.com> 2.0.0-3.sme
+- Change order for script update-domain-group-maps from 56 to 10
+  so the displayName attribute of groups can be set [SME: 4639]
+
+* Wed Oct 8 2008 Daniel B. <daniel@firewall-services.com> 2.0.0-2.sme
+- prevent samba to delete complete dn from ldap (ldap delete dn) [SME: 4638]
+
+* 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]
 
@@ -1011,10 +1022,6 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests