--- rpms/zabbix/contribs9/zabbix.spec	2020/05/14 03:38:52	1.2
+++ rpms/zabbix/contribs9/zabbix.spec	2020/05/14 03:45:18	1.3
@@ -153,6 +153,7 @@ Provides:		zabbix-proxy = %{version}-%{r
 Provides:		zabbix-proxy-implementation = %{version}-%{release}
 Obsoletes:		zabbix
 Obsoletes:		zabbix-proxy
+Provides: zabbix
 
 %description proxy-mysql
 Zabbix proxy with MySQL or MariaDB database support.
@@ -175,6 +176,7 @@ Provides:		zabbix-proxy = %{version}-%{r
 Provides:		zabbix-proxy-implementation = %{version}-%{release}
 Obsoletes:		zabbix
 Obsoletes:		zabbix-proxy
+Provides: zabbix
 
 %description proxy-pgsql
 Zabbix proxy with PostgreSQL database support.
@@ -197,6 +199,7 @@ Provides:		zabbix-proxy = %{version}-%{r
 Provides:		zabbix-proxy-implementation = %{version}-%{release}
 Obsoletes:		zabbix
 Obsoletes:		zabbix-proxy
+Provides: zabbix
 
 %description proxy-sqlite3
 Zabbix proxy with SQLite3 database support.
@@ -265,6 +268,8 @@ Provides:		zabbix-server = %{version}-%{
 Provides:		zabbix-server-implementation = %{version}-%{release}
 Obsoletes:		zabbix
 Obsoletes:		zabbix-server
+Provides: zabbix
+
 %description server-pgsql
 Zabbix server with PostgresSQL database support.
 
@@ -1247,6 +1252,11 @@ fi
 %endif
 
 %changelog
+* Sun May 10 2020 Jean-Philipe Pialasse <tests@pialasse.com> 4.4.6-2.sme
+- import 4.4.6 for SME SErver [SME: 10944]
+- add Provides: zabbix to prevent conflicts on upgrade from fws when
+  both agent and server or proxy are installed
+
 * Fri Feb 21 2020 Zabbix Packager <info@zabbix.com> - 4.4.6-1
 - update to 4.4.6
 - using libssh instead of libssh2 on rhel/centos 8