From 0b245a0ce71217ec50de4664a73e070d5dd1317a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Oct 2019 13:55:14 +0200 Subject: - add patch for PHP 7.4 from https://github.com/zendframework/zend-mail/pull/244 --- php-zendframework-zend-mail.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/php-zendframework-zend-mail.spec b/php-zendframework-zend-mail.spec index ae96a1b..1a056f4 100644 --- a/php-zendframework-zend-mail.spec +++ b/php-zendframework-zend-mail.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-zendframework-zend-mail # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.10.0 -Release: 2%{?dist} +Release: 6%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -29,6 +29,8 @@ 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-mail/pull/244.patch + BuildArch: noarch # Tests %if %{with_tests} @@ -155,6 +157,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 mv LICENSE.md LICENSE @@ -203,7 +206,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} \ @@ -217,6 +220,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -226,6 +230,10 @@ exit $ret %changelog +* Wed Oct 9 2019 Remi Collet - 2.10.0-6 +- add patch for PHP 7.4 from + https://github.com/zendframework/zend-mail/pull/244 + * Thu Jun 7 2018 Remi Collet - 2.10.0-2 - update to 2.10.0 - lower dependency on PHP 5.6 -- cgit