From 98243d1514829a4b0d2c3e9306ace36f20a242f4 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 28 Nov 2019 14:45:32 +0100
Subject: [PATCH] Adapt to be usable with upstream zabbix packages

---
 .../etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy | 4 ++--
 smeserver-zabbix-proxy.spec                                   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy b/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy
index 3e52741..5e090f3 100644
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy
+++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy
@@ -3,14 +3,14 @@ my $db = ${'zabbix-proxy'}{'DbName'} || 'zabbix';
 my $user = ${'zabbix-proxy'}{'DbUser'} || 'zabbix';
 my $pass = ${'zabbix-proxy'}{'DbPassword'} || 'secret';
 
-my $schema = `rpm -qd zabbix-server | grep schema | grep mysql`;
+my $schema = `rpm -qd zabbix-proxy-mysql | grep schema | grep mysql`;
 
 
 $OUT .= <<"END";
 #! /bin/sh
 if [ \! -d /var/lib/mysql/$db ]; then
 	/usr/bin/mysqladmin create $db
-	/usr/bin/mysql $db < $schema
+	gzip -dc $schema | /usr/bin/mysql $db
 fi
 
 /usr/bin/mysql <<EOF
diff --git a/smeserver-zabbix-proxy.spec b/smeserver-zabbix-proxy.spec
index 881fc11..c530860 100644
--- a/smeserver-zabbix-proxy.spec
+++ b/smeserver-zabbix-proxy.spec
@@ -12,10 +12,11 @@ BuildRequires: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
 Requires: fping
-Requires: zabbix-server-mysql
 Requires: zabbix-proxy-mysql
 Requires: smeserver-remoteuseraccess
 Conflicts: smeserver-zabbix-server
+Obsoletes: zabbix-server
+Obsoletes: zabbix-server-mysql
 AutoReqProv: no
 
 %description