--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2021/11/05 11:11:27	1.7
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2022/08/01 18:17:19	1.12
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-server.spec,v 1.6 2021/11/01 14:22:18 brianr Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.11 2021/11/09 05:20:13 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-server
 %define version 0.1
-%define release 25
+%define release 30
 Summary: sme server integration of zabbix server and web front-end
 Name: %{name}
 Version: %{version}
@@ -36,6 +36,10 @@ Patch18: smeserver-zabbix-server-0.1-Upd
 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
+Patch23: smeserver-zabbix-server-0.1-bz10802-checkcert-telegram.patch
+Patch24: smeserver-zabbix-server-0.1-bz11749-adminpass.patch
+Patch25: smeserver-zabbix-server-0.1-bz12068-httpd24.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -51,13 +55,36 @@ Conflicts: smeserver-zabbix-proxy
 Requires: smeserver-remoteuseraccess
 #Requires: smeserver-php-scl
 AutoReqProv: no
+# for telegram bot
+Requires: python2-pysocks python-requests python2-requests-oauthlib
+#for zabbix=>50
+#Provides: rh-php72-php-fpm rh-php72-php-mbstring rh-php72 rh-php72-php-mysqlnd rh-php72-php-gd rh-php72-php-xml rh-php72-php-ldap rh-php72-php-bcmath
+#
 
 %description
 smserver integration of zabbix server and web front-end.
-ZAbbix is an entreprise-class open source distributed monitoring
+Zabbix is an entreprise-class open source distributed monitoring
 solution
 
 %changelog
+* Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-30.sme
+- update to httpd 2.4 access syntax [SME: 12068]
+  thanks to Vasarhelyi Zsolt
+
+* Tue Nov 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-29.sme
+- set random password to Admin i fuser exists and password is zabbix [SME: 11749]
+
+* Mon Nov 08 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-28.sme
+- add check cert scripts and telegram [SME: 10802]
+  no template provided to use with
+
+* Sun Nov 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-27.sme
+- fix init sql, typo and reload deamon [SME: 11232]
+
+* 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.
@@ -176,6 +203,10 @@ solution
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %build
 perl ./createlinks
@@ -192,7 +223,13 @@ 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)' \
+	|grep -v '.pyc'|grep -v '.pyo' \
 	> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist