--- rpms/e-smith-samba+ldap/sme8/e-smith-samba+ldap.spec	2008/10/13 21:48:53	1.10
+++ rpms/e-smith-samba+ldap/sme8/e-smith-samba+ldap.spec	2010/01/31 09:59:37	1.15
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba+ldap.spec,v 1.9 2008/10/08 14:30:01 vip-ire Exp $
+# $Id: e-smith-samba+ldap.spec,v 1.14 2010/01/31 09:55:04 snetram Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba+ldap
 Name: %{name}
 %define version 2.2.0
-%define release 4
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,10 @@ Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-samba+ldap-2.2.0-dont_delete_dn.patch
 Patch2: e-smith-samba+ldap-2.2.0-update_domain_map_order.patch
 Patch3: e-smith-samba+ldap-2.2.0-sambaRole.patch
+Patch4: e-smith-samba+ldap-2.2.0-root_passwd_for_samba.patch
+Patch5: e-smith-samba+ldap-2.2.0-win7samba.patch
+Patch6: e-smith-samba+ldap-2.2.0-recylebin_perms.patch
+Patch7: e-smith-samba+ldap-2.2.0-enable-bind-interfaces.patch
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -29,6 +33,20 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
+- Enable bindinterfaces by default [SME: 3325]
+- Set recyle bin permissions [SME: 1734]
+
+* Sat Dec 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-7.sme
+- Add registry file to server-resources to allow windows 7 to
+  join Samba 3.x domains [SME: 5425]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+- Fix oslevel fragment for server roles [SME: 4730]
+
+* Tue Oct 21 2008 Daniel B. <daniel@firewall-services.com> 2.2.0-5.sme
+- Re-add ldap root password when local SID can't be find [SME: 4711]
+
 * Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
 - Add patch to support multiple samba roles [SME: 4172]
 
@@ -1022,6 +1040,10 @@ 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