From 45f68a9fdfee53fa54a7d558b43a867844f67b9e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 24 Oct 2017 14:51:52 +0200
Subject: fix FTBFS from Koschei, add patch for PHP 7.2 from
 https://github.com/zendframework/zend-form/pull/171

---
 php-zendframework-zend-form.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'php-zendframework-zend-form.spec')

diff --git a/php-zendframework-zend-form.spec b/php-zendframework-zend-form.spec
index 8ce3489..29f7acf 100644
--- a/php-zendframework-zend-form.spec
+++ b/php-zendframework-zend-form.spec
@@ -21,7 +21,7 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        2.10.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -30,6 +30,8 @@ URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
+Patch0:         https://github.com/zendframework/zend-form/commit/fbda16c3e87725ac64418e8578d167320855f20b.patch
+
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -140,6 +142,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -175,7 +178,7 @@ EOF
 
 ret=0
 # 7.2: https://github.com/zendframework/zend-form/issues/157
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71; do
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit6} -d memory_limit=1G || ret=1
@@ -197,6 +200,10 @@ exit $ret
 
 
 %changelog
+* Tue Oct 24 2017 Remi Collet <remi@remirepo.net> - 2.10.2-3
+- fix FTBFS from Koschei, add patch for PHP 7.2 from
+  https://github.com/zendframework/zend-form/pull/171
+
 * Mon May 22 2017 Remi Collet <remi@remirepo.net> - 2.10.2-1
 - Update to 2.10.2
 
-- 
cgit