--- rpms/smeserver-vacation/contribs10/smeserver-vacation.spec	2020/06/12 05:52:10	1.4
+++ rpms/smeserver-vacation/contribs10/smeserver-vacation.spec	2021/02/26 05:52:04	1.7
@@ -1,10 +1,10 @@
-# $Id: smeserver-vacation.spec,v 1.3 2020/05/19 14:34:51 brianr Exp $
+# $Id: smeserver-vacation.spec,v 1.6 2021/02/23 04:47:36 jpp Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-vacation
 %define version 1.1
-%define release 29
+%define release 32
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -38,11 +38,15 @@ Patch21: smeserver-vacation-1.1-locale-2
 Patch22: smeserver-vacation-1.1-SME10-Move-to-manager2.patch
 Patch23: smeserver-vacation-1.1-Better-display-dates-in-list.patch
 Patch24: smeserver-vacation-1.1-Update-for-Apache-Mod-Proxy-based-server2.patch
+Patch25: smeserver-vacation-1.1-Add-in-update-action-to-restart-smanager.patch
+Patch26: smeserver-vacation-1.1-bz11399-tableEncoding.patch
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 9.0,
 Requires: e-smith-formmagick >= 1.4.0-12
+# needs /usr/share/perl5/vendor_perl/ctime.pl
+Requires: perl-Perl4-CoreLibs
 BuildRequires: e-smith-devtools >= 1.13.1-03
 #BuildRequires: smeserver-manager >= 24
 AutoReqProv: no
@@ -53,6 +57,16 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* Fri Feb 26 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-32.sme
+- avoid reencoding of strings in admin table of users [SME: 11399]
+
+* Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-31.sme
+- add requirement ctime.pl to display log  [SME: 10927]
+
+* Sat Oct 24 2020 Brian Read <brianr@bjsystems.co.uk> 1.1-30.sme
+- Update to make call to smanager and systemd dependant on smanager being installed and move from post in spec file [SME: 11052]
+- to smeserver-vacation-update event
+
 * Thu Jun 11 2020 Brian Read <brianr@bjsystems.co.uk> 1.1-29.sme
 - Update for Apache-Mod-Proxy mode Server2 [SME:10927]
 
@@ -365,6 +379,8 @@ enable vacation for themselves and to mo
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 perl createlinks
@@ -401,8 +417,14 @@ rm -rf $RPM_BUILD_ROOT
 if [ -d /etc/e-smith/events/conf-userpanel ] ; then
    /sbin/e-smith/signal-event conf-userpanel
 fi
-/sbin/e-smith/signal-event manager2-refresh
-systemctl restart smanager
+
+#if (systemctl list-unit-files |grep smanager) then
+#  echo "Smanager restart in spec file"
+#  /sbin/e-smith/signal-event manager2-refresh;
+#  systemctl restart smanager
+#else
+#  echo "No smanager restart in spec file"
+#fi
 
 %postun
 #uninstall