From b2c22ebcf9b5f1ddfcbd145ac81bd742e3fc8797 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 2 Jul 2015 15:44:37 +0200 Subject: [PATCH] No longer package Zend as vendor library All RPM installations now depend on php-ZendFramework which is avaiable through the EPEL repository. --- icingaweb2.spec | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index 99d5009d6..7cddee0d3 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -163,18 +163,6 @@ Requires: %{php} >= 5.3.0 Icinga Web 2 vendor library Parsedown -%package vendor-Zend -Version: 1.12.9 -Release: 1%{?dist} -Summary: Icinga Web 2 vendor library Zend Framework -Group: Development/Libraries -License: BSD -Requires: %{php} >= 5.3.0 - -%description vendor-Zend -Icinga Web 2 vendor library Zend - - %prep %setup -q @@ -182,12 +170,12 @@ Icinga Web 2 vendor library Zend %install rm -rf %{buildroot} -mkdir -p %{buildroot}/{%{basedir}/{modules,library,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} +mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules/setup,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} cp -prv application doc %{buildroot}/%{basedir} cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules cp -prv library/Icinga %{buildroot}/%{phpdir} -cp -prv library/vendor %{buildroot}/%{basedir}/library +cp -prv library/vendor/{dompdf,HTMLPurifier,JShrink,lessphp,Parsedown} %{buildroot}/%{basedir}/library/vendor cp -prv public/{css,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir} @@ -273,8 +261,3 @@ exit 0 %files vendor-Parsedown %defattr(-,root,root) %{basedir}/library/vendor/Parsedown - - -%files vendor-Zend -%defattr(-,root,root) -%{basedir}/library/vendor/Zend