--- rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2008/04/12 14:41:13	1.2
+++ rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2010/12/02 17:38:16	1.13
@@ -1,32 +1,66 @@
-# $Id$
-# Authority: gregzartman
-# Name: Greg J. Zartman
+# $Id: smeserver-adv-samba.spec,v 1.12 2010/12/02 15:28:37 slords Exp $
+# Authority: gzartman
+# Name: Greg Zartman
 
 Summary: SME Server specific advanced Samba configuration files and templates
 %define name smeserver-adv-samba
 Name: %{name}
 %define version 0.1.0
-%define release 1
+%define release 7
 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
+Patch4: smeserver-adv-samba-0.1.0-auth.patch
+Patch5: smeserver-adv-samba-0.1.0-logdir-fix.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: samba >= 3.0.25b
-Requires: samba-client >= 3.0.25b
+Requires: e-smith-samba >= 2.0.0
+Requires: e-smith-base  >= 5.0.0
+Requires: samba-common >= 3.0.25b
 AutoReqProv: no
 
 %changelog
-* Fri Apr 11 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0
+* Thu Dec 2 2010 Shad L. Lords <slords@mail.com> 0.1.0-7.sme
+- Fix logging directory for winbind
+
+* Thu Dec 2 2010 Shad L. Lords <slords@mail.com> 0.1.0-6.sme
+- Reduce requires to samba-common to fix upgrades.
+
+* Tue Nov 5 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-5
+- Add nsswitch.conf and pam.d/login fragments to workgroup-update
+  templates2expand [SME: 4729].
+
+* 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].
+- Add a template fragment to ibays to set the samba 'force group'
+  parameter to the current ibay group or the group shared when SME is
+  configured as a Domain Member of Active Directory Member.  The is required
+  so that domain members can have write access to domain member shares.  At
+  some point, we may decide to fully support domain groups transparently
+  at the domain member or active directory member server [SME: 4196].
+
+* Fri Apr 11 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-1
 - Roll initial package.
 - Provide configuration parameters to deploy Samba winbindd deamon.
 - Add template to nsswitch.conf to configure nss to include winbindd auth.
   The configuration parameters included in this fragment really belong
-  in e-smith-base, but we are including it in this package until it it 
+  in e-smith-base, but we are including it in this package until it is 
   deemed appropriate to move it to e-smith-base.  
 
 %description
@@ -44,9 +78,13 @@ smeserver-adv-samba is to e-smith-samba
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-mkdir -p root/etc/e-smith/tests
 perl createlinks
 
 # Manage supervise and multilog for winbindd.
@@ -57,11 +95,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)' \