--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2021/11/01 14:22:18	1.6
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2021/11/07 06:43:25	1.8
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-server.spec,v 1.5 2020/12/10 15:49:09 brianr Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.7 2021/11/05 11:11:27 brianr Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-server
 %define version 0.1
-%define release 24
+%define release 26
 Summary: sme server integration of zabbix server and web front-end
 Name: %{name}
 Version: %{version}
@@ -35,6 +35,8 @@ Patch17: smeserver-zabbix-server-0.1-zab
 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
+Patch21: smeserver-zabbix-server-0.1-Switch-to-specific-php-fpm.patch
+Patch22: smeserver-zabbix-server-0.1-bz11232-installSME10.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -57,6 +59,19 @@ ZAbbix is an entreprise-class open sourc
 solution
 
 %changelog
+* Sun Nov 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-26.sme
+- fix session and log issue [SME: 11232]
+  fix mysql-init not launched
+
+* Mon Nov 01 2021 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+  Tue Mar 02 2009 --> Tue Feb 24 2009 or Mon Mar 02 2009 or Tue Mar 03 2009 or ....
+  Wed Feb 07 2016 --> Wed Feb 03 2016 or Sun Feb 07 2016 or Wed Feb 10 2016 or ....
+
+* Mon Nov 01 2021 Brian Read <brianr@bjsystems.co.uk> 0.1-25.sme
+- Switch-to-specific-php-fpm [SME: 11232]
+
 * Mon Nov 01 2021 Brian Read <brianr@bjsystems.co.uk> 0.1-24.sme
 - Remove post and postun command in spec file [SME: 11232]
 
@@ -91,7 +106,8 @@ solution
 - fix php requirement
 - fix add path to new db
 
-* Wed Feb 7 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 0.1-14.sme
+* Sun Feb 07 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 0.1-14.sme
+  Wed Feb 07 2016 --> Wed Feb 03 2016 or Sun Feb 07 2016 or Wed Feb 10 2016 or ....
 - New roll for sme9
 
 * Mon Apr 29 2013 Daniel B. <daniel@firewall-services.com> 0.1-13
@@ -164,10 +180,16 @@ solution
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %build
 perl ./createlinks
 %{__mkdir_p} root/var/lib/zabbix/tmp
+#%{__mkdir_p} root/var/log/zabbix - conflict with zabbix-server-mysql
+%{__mkdir_p} root/var/log/php/zabbix
+%{__mkdir_p} root/var/lib/php/zabbix/{tmp,wsdlcache,opcache,session}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,7 +198,12 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 	--file /var/lib/zabbix/bin/fping 'attr(0750,root,zabbix)' \
 	--file /var/lib/zabbix/bin/fping6 'attr(0750,root,zabbix)' \
-	--dir /var/lib/zabbix/tmp 'attr(0755,zabbix,zabbix)' \
+	--dir /var/lib/zabbix/tmp 'attr(0750,zabbix,zabbix)' \
+	--dir /var/log/php/zabbix  'attr(0770,www,www)' \
+	--dir /var/lib/php/zabbix  'attr(0755,root,www)' \
+ 	--dir /var/lib/php/zabbix/tmp 'attr(0770,root,www)' \
+ 	--dir /var/lib/php/zabbix/opcache 'attr(0770,root,www)' \
+ 	--dir /var/lib/php/zabbix/session 'attr(0770,root,www)' \
 	> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist