--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2021/11/09 04:28:18	1.10
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2022/12/10 07:44:58	1.15
@@ -1,10 +1,10 @@
-# $Id: smeserver-zabbix-server.spec,v 1.9 2021/11/08 03:55:26 jpp Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.14 2022/08/01 18:30:06 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define name smeserver-zabbix-server
 %define version 0.1
-%define release 28
+%define release 30
 Summary: sme server integration of zabbix server and web front-end
 Name: %{name}
 Version: %{version}
@@ -38,26 +38,36 @@ Patch20: smeserver-zabbix-server-0.1-Add
 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
+Patch26: smeserver-zabbix-server-0.1-bz12031-backup.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}
-Requires: e-smith-release >= 9.0
+Requires: e-smith-release >= 10.0
+Requires: e-smith-apache >= 2.6.0-19
+Requires: smeserver-php >= 3.0.0-43
 Requires: fping
-Obsoletes: zabbix-server
 Requires: zabbix-server-mysql >= 4.4.6
 Requires: zabbix-web-mysql >= 4.4.6
 Requires: zabbix-web >= 4.4.6
 Requires: sendxmpp
-Conflicts: smeserver-zabbix-proxy
 Requires: smeserver-remoteuseraccess
-#Requires: smeserver-php-scl
-AutoReqProv: no
 # for telegram bot
 Requires: python2-pysocks python-requests python2-requests-oauthlib
+Obsoletes: zabbix-server
+Conflicts: smeserver-zabbix-proxy
+AutoReqProv: no
+
 #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
-#
+#Provides:		zabbix-web-database-scl-php73 = %{version}-%{release}
+#Provides:		zabbix-web-deps-scl = %{version}-%{release}
+#Provides:		zabbix-web-deps-scl-php73 = %{version}-%{release}
+#Requires:		zabbix-web = %{version}-%{release}
+#Requires: php73-php-mysqlnd  php73 php73-php-gd php73-php-bcmath php73-php-mbstring php73-php-xml php73-php-ldap php73-php-fpm php73-php-mysqlnd
+
 
 %description
 smserver integration of zabbix server and web front-end.
@@ -65,6 +75,16 @@ Zabbix is an entreprise-class open sourc
 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
+- add to core backup [SME: 12031]
+  non rpm owned files in /etc/zabbix, /etc/zabbix/zabbix_agentd.conf.d/
+  and /var/lib/zabbix/bin/
+
+* 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
@@ -196,6 +216,9 @@ solution
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 perl ./createlinks