--- 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/07/25 19:07:12	1.5
@@ -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 4
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,7 @@ Patch2: e-smith-samba-1.15.1-hideprofile
 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
 Obsoletes: e-smith-netlogon
 Obsoletes: e-smith-samba
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -29,6 +30,9 @@ Provides: e-smith-samba = 1.15.1-01
 AutoReqProv: no
 
 %changelog
+* 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)
@@ -1005,6 +1009,7 @@ Configuration files and templates for th
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/tests