--- rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2008/10/11 19:32:08	1.3
+++ rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2008/10/17 02:23:30	1.7
@@ -2,23 +2,34 @@ Summary: SME Server specific advanced Sa
 %define name smeserver-adv-samba
 Name: %{name}
 %define version 0.1.0
-%define release 2
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-adv-samba-0.1.0-2.patch
+Patch2: smeserver-adv-samba-0.1.0-safe_winbind.patch
+Patch3: smeserver-adv-samba-0.1.0-winbind2.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
-Requires: e-smith-samba >= 1.14.1-6
+Requires: e-smith-samba >= 2.0.0
+Requires: e-smith-base  >= 5.0.0
 Requires: samba >= 3.0.25b
 Requires: samba-client >= 3.0.25b
 Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
+* Wed Oct 15 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-4
+- Update winbindd-service-status action to set service to disabled if 
+  service is enabled and ServerRole is changed.
+* Tue Oct 14 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-3
+- Set winbindd to disabled by default and on initial install, was 
+  previouslly enabled by default.
+- Create action to start winbindd if the DM or ADM server roles are designated.
+
 * Tue Sep 30 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-2
 - Add template fragments to etc/pam.d/login to look for winbindd auth is
   winbindd is running [SME: 4196].
@@ -53,9 +64,10 @@ smeserver-adv-samba is to e-smith-samba
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-mkdir -p root/etc/e-smith/tests
 perl createlinks
 
 # Manage supervise and multilog for winbindd.
@@ -66,11 +78,9 @@ touch root/var/service/winbindd/down
 mkdir -p root/var/service/winbindd/log/supervise
 mkdir -p root/var/log/winbindd
 
-# Make storage point for shadowcopies
-mkdir -p root/home/e-smith/files/.shadow
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist \
     --dir '/var/service/winbindd' 'attr(1755,root,root)' \