From 00c0d0b107fa4ffc42d1cbaec2e2feaece2fcaff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Oct 2019 08:03:35 +0200 Subject: - add patches for PHP 7.4 from https://github.com/zendframework/zend-view/pull/192 https://github.com/zendframework/zend-view/pull/195 --- php-zendframework-zend-view.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'php-zendframework-zend-view.spec') diff --git a/php-zendframework-zend-view.spec b/php-zendframework-zend-view.spec index 47617b1..9eab1aa 100644 --- a/php-zendframework-zend-view.spec +++ b/php-zendframework-zend-view.spec @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.11.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -29,6 +29,9 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-view/pull/195.patch +Patch1: https://patch-diff.githubusercontent.com/raw/zendframework/zend-view/pull/192.patch + BuildArch: noarch # Tests %if %{with_tests} @@ -213,6 +216,8 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 +%patch1 -p1 mv LICENSE.md LICENSE @@ -283,7 +288,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php70 php71 php72 php73; do +for cmd in php php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi @@ -304,6 +309,11 @@ exit $ret %changelog +* Fri Oct 11 2019 Remi Collet - 2.11.2-3 +- add patches for PHP 7.4 from + https://github.com/zendframework/zend-view/pull/192 + https://github.com/zendframework/zend-view/pull/195 + * Wed Feb 20 2019 Remi Collet - 2.11.2-1 - update to 2.11.2 -- cgit