--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2020/12/08 15:58:14	1.3
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2021/11/01 14:22:18	1.6
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-server.spec,v 1.2 2020/12/07 15:26:43 brianr Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.5 2020/12/10 15:49:09 brianr Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-server
 %define version 0.1
-%define release 21
+%define release 24
 Summary: sme server integration of zabbix server and web front-end
 Name: %{name}
 Version: %{version}
@@ -34,6 +34,7 @@ Patch16: smeserver-zabbix-server-0.1-SME
 Patch17: smeserver-zabbix-server-0.1-zabbix4.4.6.patch
 Patch18: smeserver-zabbix-server-0.1-Update-httpd-createlinks-and-adduser.ini.patch
 Patch19: smeserver-zabbix-server-0.1-Template-user-dot-ini-and-override-service-file-change-pid-in-conf-file.patch
+Patch20: smeserver-zabbix-server-0.1-Add-in-zabbix-conf-expansion-to-createlinks.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -56,6 +57,15 @@ ZAbbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Mon Nov 01 2021 Brian Read <brianr@bjsystems.co.uk> 0.1-24.sme
+- Remove post and postun command in spec file [SME: 11232]
+
+* Thu Dec 10 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-23.sme
+- Add in post instructions to spec for SQL db creation [SME: 11232]
+
+* Tue Dec 08 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-22.sme
+- Add expand zabbix-server.conf and .user.ini to creatlinks update event [SME:11232]
+
 * Tue Dec 08 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-21.sme
 - Template-user-dot-ini-and-override-service-file-change-pid-in-conf-file [SME: 11232]
 
@@ -153,6 +163,7 @@ solution
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 perl ./createlinks
@@ -174,14 +185,17 @@ rm -f %{name}-%{version}-filelist
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+#/sbin/e-smith/expand-template /etc/e-smith/sql/init/80zabbix-server
+#/etc/rc.d/init.d/mysql.init start
 
 %postun
 #uninstall
-if [ $1 = 0 ] ; then
- /sbin/e-smith/db configuration setprop zabbix-server status disabled
- /etc/init.d/zabbix-server stop
- /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
- /usr/bin/sv h /service/httpd-e-smith
-fi
+#if [ $1 = 0 ] ; then
+# /sbin/e-smith/db configuration setprop zabbix-server status disabled
+# /etc/init.d/zabbix-server stop
+# /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
+# /usr/bin/sv h /service/httpd-e-smith
+#fi
 
 true