--- rpms/smeserver-vacation/contribs10/smeserver-vacation.spec	2020/04/14 14:42:41	1.1
+++ rpms/smeserver-vacation/contribs10/smeserver-vacation.spec	2020/10/26 10:00:28	1.5
@@ -1,10 +1,10 @@
-# $Id: smeserver-vacation.spec,v 1.29 2018/12/14 12:02:42 jcrisp Exp $
+# $Id: smeserver-vacation.spec,v 1.4 2020/06/12 05:52:10 brianr Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-vacation
 %define version 1.1
-%define release 26
+%define release 30
 Summary: SME Server enhancement to enable vacation messages for users.
 Name: %{name}
 Version: %{version}
@@ -35,12 +35,17 @@ Patch18: smeserver-vacation-1.1-bz9073-r
 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
+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
 
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 9.0,
 Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
+#BuildRequires: smeserver-manager >= 24
 AutoReqProv: no
 
 %description
@@ -49,6 +54,19 @@ Optionally provides a user-manager panel
 enable vacation for themselves and to modify their own message
 
 %changelog
+* 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]
+
+* Tue May 19 2020 Brian Read <brianr@bjsystems.co.uk> 1.1-28.sme
+- Part of SME10 Server manager2  - Better display of dates in list [SME:10927 ]
+
+* Tue Apr 28 2020 Brian Read <brianr@bjsystems.co.uk> 1.1-27.sme
+- Update to SME10 - rework server manager panels to use manager2 [SME:10927]
+
 * Fri Dec 14 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 1.1-26.sme
 - apply locale 2018-12-14 patch
 
@@ -349,6 +367,10 @@ enable vacation for themselves and to mo
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %build
 perl createlinks
@@ -386,6 +408,14 @@ if [ -d /etc/e-smith/events/conf-userpan
    /sbin/e-smith/signal-event conf-userpanel
 fi
 
+#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
 if [ $1 = 0 ] ; then