--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2022/12/10 20:43:15	1.16
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server.spec	2022/12/11 01:45:54	1.18
@@ -1,4 +1,4 @@
-# $Id: smeserver-zabbix-server.spec,v 1.15 2022/12/10 07:44:58 jpp Exp $
+# $Id: smeserver-zabbix-server.spec,v 1.17 2022/12/10 20:45:27 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -41,6 +41,7 @@ Patch23: smeserver-zabbix-server-0.1-bz1
 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
+Patch27: smeserver-zabbix-server-0.1-z50.patch
 
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -60,22 +61,14 @@ 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.
 Zabbix is an entreprise-class open source distributed monitoring
 solution
 
 %package z50
-%define provscl 5.0.30-1
+%define provscl 5.0.30-1.el7
+#5.0.30-1
 Summary: SME Server integration of zabbix server 5.0 and web front-end using Remi SCLO
 Group:    Applications/Internet
 #common
@@ -86,17 +79,17 @@ Requires: e-smith-apache >= 2.6.0-19
 Requires: smeserver-php >= 3.0.0-43
 Requires: fping
 Requires: zabbix-server-mysql >= 5.0.0
-Requires: zabbix-web-mysql-scl >= 5.0.0
-Requires: zabbix-web >= 5.0.0
+#Requires: zabbix-web-mysql-scl >= 5.0.0
+#Requires: zabbix-web >= 5.0.0
 Requires: sendxmpp
 Requires: smeserver-remoteuseraccess
 # specific
-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 = %{provscl}
+#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-php74 = %{provscl}
 Provides: zabbix-web-deps-scl =  %{provscl}
 Provides: zabbix-web-deps-scl-php73 = %{provscl}
 Requires: zabbix-web = %{provscl}
-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
+Requires: php74-php-mysqlnd  php74 php74-php-gd php74-php-bcmath php74-php-mbstring php74-php-xml php74-php-ldap php74-php-fpm php74-php-mysqlnd
 
 %description z50
 SME Server integration of zabbix server 5.0 and web front-end using Remi SCLO.
@@ -184,7 +177,7 @@ solution
 * Wed Dec 2 2009 Daniel B. <daniel@firewall-services.com> 0.1-11
 - Support several mysql DB patches
 
-* Tue Mar 02 2009 Daniel B. <daniel@firewall-services.com> 0.1-10
+* Tue Mar 03 2009 Daniel B. <daniel@firewall-services.com> 0.1-10
 - Add smeserver-remoteuseraccess as a dependencie (sudoers template problem)
 
 * Mon Mar 02 2009 Daniel B. <daniel@firewall-services.com> 0.1-9
@@ -251,6 +244,7 @@ solution
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 perl ./createlinks