--- rpms/e-smith-samba/sme10/e-smith-samba.spec	2017/03/24 22:12:00	1.6
+++ rpms/e-smith-samba/sme10/e-smith-samba.spec	2020/11/16 15:44:39	1.12
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.5 2016/07/22 10:14:18 unnilennium Exp $
+# $Id: e-smith-samba.spec,v 1.11 2020/06/27 19:32:05 jpp Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.6.0
-%define release 6
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,7 +13,11 @@ Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-samba-2.6.0-displayCharset.patch
 Patch1: e-smith-samba-2.6.0.bz9398.DeprecatedRsyslogSyntaxSamba.patch
 Patch2: e-smith-samba-2.6.0-bz9688.skipredirect.patch
-Patch3: e-smith-samba-2.6.0.bz9038.W10_registry.patch
+Patch3: e-smith-samba-2.6.0.bz10169.outlook2016domainmember.patch
+Patch4: e-smith-samba-2.6.0-bz10963-bz10576-minprot-SMB2.patch
+Patch5: e-smith-samba-2.6.0-bz9060-remove-win98-reg.patch
+Patch6: e-smith-samba-2.6.0-bz11093-add-krb5-template.patch
+
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -42,6 +46,21 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Mon Nov 16 2020 John Crisp <jcrisp@safeansoundit.co.uk> 2.6.0-11.sme
+- Add /etc/krb5.conf as template using templates from smeserver-samba
+- [SME: 11093]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+- remove win98pwdcache.reg from server-resources [SME: 9060]
+
+* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- set min server and client protocol SMB2 [SME: 10576]
+  add check so max always greater than min
+- add port 445 if min server protocol is SMB2 or SMB3 [SME: 10963]
+
+* Fri Feb 09 2018 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix typo in  /server-resources/regedit/win10samba.reg  [SME: 10515]
+
 * Fri Mar 24 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme
 - fix outlook error code 0x8004011c [SME: 10169]
 - when setting up and email account on a win10 computer joined to a domain (with roaming profiles)
@@ -1247,6 +1266,9 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks