--- rpms/smeserver-vacation/contribs9/smeserver-vacation.spec	2017/01/16 21:39:16	1.25
+++ rpms/smeserver-vacation/contribs9/smeserver-vacation.spec	2018/12/14 12:02:42	1.29
@@ -1,10 +1,10 @@
-# $Id: smeserver-vacation.spec,v 1.24 2017/01/16 21:37:46 unnilennium Exp $
+# $Id: smeserver-vacation.spec,v 1.28 2017/02/26 19:15:53 unnilennium Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-vacation
 %define version 1.1
-%define release 23
+%define release 26
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -33,6 +33,9 @@ Patch16: smeserver-vacation-1.1.bz8772.f
 Patch17: smeserver-vacation-1.1-locale-2016-07-15.patch
 Patch18: smeserver-vacation-1.1-bz9073-race.condition.vulnarability.patch
 Patch19: smeserver-vacation-1.1-locale-2017-01-16.patch
+Patch20: smeserver-vacation-1.1-bz6614-autodetect.html.patch
+Patch21: smeserver-vacation-1.1-locale-2018-12-14.patch
+
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 9.0,
@@ -46,6 +49,16 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Fri Dec 14 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 1.1-26.sme
+- apply locale 2018-12-14 patch
+
+* Sun Feb 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-25.sme
+- html message autodection: swith to html when "<html" and "</html>" are present
+- in the content, update patch [SME: 6614]
+
+* Mon Jan 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-24.sme
+- NFR allow html message and auto detect to switch from text to html [SME: 6614]
+
 * Mon Jan 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-23.sme
 - Fix possible race condition vulnerability during creation of vacation.msg [SME: 9073]
 - thanks to Mats Schuh and Charlie Brady for the work.
@@ -198,7 +211,7 @@ enable vacation for themselves and to mo
 * Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.0-16
 - update locale 2008-03-11
 
-* Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.0-15
+* Sat Mar 08 2008 Stephen Noble <support@dungog.net> - 1.0-15
 - prepare en lexicons for pootle translations
 
 * Wed Dec 26 2007 Stephen Noble <support@dungog.net> 1.0-14
@@ -303,7 +316,7 @@ enable vacation for themselves and to mo
 - [0.2-2]
 - fixed bug in vacation script that delivered multiple bounces to users
 
-* Mon Sep 04 2001 Daniel van Raay <danielvr@caa.org.au>
+* Tue Sep 04 2001 Daniel van Raay <danielvr@caa.org.au>
 - [0.2-1]
 - added -j option to vacation command line
 - updated for compatibility with e-smith 4.1
@@ -334,7 +347,8 @@ enable vacation for themselves and to mo
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-
+%patch20 -p1
+%patch21 -p1
 
 %build
 perl createlinks