--- 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/08/03 09:40:17	1.6
@@ -2,7 +2,7 @@ Summary: e-smith specific Samba configur
 %define name e-smith-samba+ldap
 Name: %{name}
 %define version 1.15.1
-%define release 3
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,9 @@ Patch1: e-smith-samba-1.15.1-shadowfix.p
 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
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -28,6 +31,16 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* 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]
 
@@ -999,6 +1012,9 @@ Configuration files and templates for th
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests