--- rpms/e-smith-samba/sme10/e-smith-samba.spec	2016/02/05 17:16:29	1.1
+++ rpms/e-smith-samba/sme10/e-smith-samba.spec	2020/12/16 12:35:56	1.14
@@ -1,15 +1,25 @@
-# $Id: e-smith-samba.spec,v 1.24 2015/11/30 19:20:37 stephdl Exp $
+# $Id: e-smith-samba.spec,v 1.13 2020/11/26 00:11:04 jcrisp Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.6.0
-%define release 1
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 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.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
+Patch7: e-smith-samba-2.6.0-bz11198-fix-pid-dir.patch
+Patch8: e-smith-samba-2.6.0-bz11199-fix-mutex-locking.patch
+
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -38,6 +48,44 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-13.sme
+- Fix mutex locking [SME: 11199]
+
+* Thu Nov 26 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-12.sme
+- Fix pid directory [SME: 11198]
+
+* 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)
+
+* Fri Jul 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- add systemd skip redirect [SME: 9688]
+
+* Thu Jul 14 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-4.sme
+- Fix deprecated syntax '~' in rsyslog [SME: 9398]
+- added e-smith-samba-2.6.0.bz9398.DeprecatedRsyslogSyntaxSamba.patch
+
+* Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Rebuild for [SME: 9393]
+
+* Tue Apr 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- dropped display charset option [SME: 9440]
+
 * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -1222,6 +1270,15 @@ Configuration files and templates for th
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks