From 195b080cffc3aacf417b4c9d87c9efeca0414b68 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 2 Jul 2015 09:48:19 +0200 Subject: [PATCH] RPM: Install php-ZendFramework on RHEL/CentOS 7 and drop support for RHEL/CentOS 5 The EPEL repository for RHEL/CentOS 7 does now include php-ZendFramework version 1. It had only version 2 some time ago. Further, I removed "support" for RHEL/CentoOS 5. --- icingaweb2.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index fa0fe7e69..99d5009d6 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -15,20 +15,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Packager: Icinga Team %if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} +%define php php +%define php_cli php-cli %define wwwconfigdir %{_sysconfdir}/httpd/conf.d %define wwwuser apache -%if 0%{?rhel} == 5 -%define php php53 -%define php_cli php53-cli -%else -%define php php -%define php_cli php-cli -%endif -%if 0%{?rhel} == 6 -%define zend php-ZendFramework -%else -%define zend %{name}-vendor-Zend -%endif +%define zend php-ZendFramework %endif %if 0%{?suse_version} @@ -56,6 +47,7 @@ Requires: %{name}-vendor-JShrink Requires: %{name}-vendor-lessphp Requires: %{name}-vendor-Parsedown Requires: %{zend} +Obsoletes: %{name}-vendor-zend %description