--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2020/12/04 18:33:30	1.1
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2020/12/08 15:58:14	1.3
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-server.spec,v 1.8 2020/05/14 03:23:28 jpp Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.2 2020/12/07 15:26:43 brianr Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-server
 %define version 0.1
-%define release 19
+%define release 21
 Summary: sme server integration of zabbix server and web front-end
 Name: %{name}
 Version: %{version}
@@ -32,6 +32,8 @@ Patch14: smeserver-zabbix-server-0.1-sme
 Patch15: smeserver-zabbix-server-0.1-sme9zabb3.2.4.patch
 Patch16: smeserver-zabbix-server-0.1-SME10458-SenderFrequency.deprecated.patch
 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
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -45,7 +47,7 @@ Requires: zabbix-web >= 4.4.6
 Requires: sendxmpp
 Conflicts: smeserver-zabbix-proxy
 Requires: smeserver-remoteuseraccess
-Requires: smeserver-php-scl
+#Requires: smeserver-php-scl
 AutoReqProv: no
 
 %description
@@ -54,6 +56,15 @@ ZAbbix is an entreprise-class open sourc
 solution
 
 %changelog
+* 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]
+
+* Mon Dec 07 2020 Brian Read <brianr@bjsystems.co.uk> 0.1-20.sme
+- Import to SME10 tree [SME: 11232]
+- Update createlinks for systemd
+- Update httpd.conf for php-fpw
+- Add .user.ini for php-admin-flags that where in httpd.conf
+
 * Sun May 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 0.1-19.sme
 - adapt for zabbix 4.4.6 [SME: 10944]
 
@@ -140,6 +151,8 @@ solution
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 perl ./createlinks