--- rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2008/10/15 07:45:09	1.4
+++ rpms/smeserver-adv-samba/contribs7/smeserver-adv-samba.spec	2010/12/02 15:28:37	1.12
@@ -1,8 +1,12 @@
+# $Id: smeserver-adv-samba.spec,v 1.11 2009/03/03 15:50:17 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 2
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,18 +14,29 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
 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
-* Tue Oct 15 2008 Greg J. Zartman <greg@leiinc.com> 0.1.0-3
+* Thu Dec 2 2010 Greg J. Zartman <greg@leiinc.com> 0.1.0-6
+- 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.
@@ -61,9 +76,10 @@ smeserver-adv-samba is to e-smith-samba
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-mkdir -p root/etc/e-smith/tests
 perl createlinks
 
 # Manage supervise and multilog for winbindd.
@@ -74,9 +90,6 @@ 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