From 45ef285e3ded3547898ed52e752c0344d4cf0bdb Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 21 Jul 2015 17:32:17 +0200 Subject: [PATCH] RPM: Let php-Icinga require Zend and Zend's MySQL and PostgreSQL adapters This installs both the MySQL and PostgreSQL libs even if the user only wants to use either MySQL or PostgreSQL. But the depencies installed--mysql-libs and postgresql-libs respectively--are so minimal that this is a good trade off for managing our dependencies atm. fixes #9314 --- icingaweb2.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index 7cddee0d3..e3513e979 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -46,8 +46,6 @@ Requires: %{name}-vendor-HTMLPurifier Requires: %{name}-vendor-JShrink Requires: %{name}-vendor-lessphp Requires: %{name}-vendor-Parsedown -Requires: %{zend} -Obsoletes: %{name}-vendor-zend %description @@ -84,6 +82,10 @@ Requires: %{php}-gd %{php}-intl %{?fedora:Requires: php-pecl-imagick} %{?rhel:Requires: php-pecl-imagick} %{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix} +Requires: %{zend} +Obsoletes: %{name}-vendor-zend +Requires: %{zend}-Db-Adapter-Pdo-Mysql +Requires: %{zend}-Db-Adapter-Pdo-Pgsql %description -n php-Icinga Icinga Web 2 PHP library