From 7bdee57ad00cc6ad238fde85a4c4689f989a3835 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 16 Oct 2019 11:48:59 +0200
Subject: - add patch for PHP 7.4 from  
 https://github.com/zendframework/zend-server/pull/30

---
 php-zendframework-zend-server.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/php-zendframework-zend-server.spec b/php-zendframework-zend-server.spec
index 15f3d57..fbb1df6 100644
--- a/php-zendframework-zend-server.spec
+++ b/php-zendframework-zend-server.spec
@@ -1,6 +1,6 @@
 # remirepo/Fedora spec file for php-zendframework-zend-server
 #
-# 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,15 +21,16 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        2.8.0
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        Zend Framework %{library} component
 
-Group:          Development/Libraries
 License:        BSD
 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-server/pull/30.patch
+
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -102,6 +103,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -133,7 +135,7 @@ require_once 'test/TestAsset/reflectionTestFunction.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" php71 php72; do
+for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
@@ -146,6 +148,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -154,6 +157,10 @@ exit $ret
 
 
 %changelog
+* Wed Oct 16 2019 Remi Collet <remi@remirepo.net> - 2.8.0-6
+- add patch for PHP 7.4 from
+  https://github.com/zendframework/zend-server/pull/30
+
 * Thu May  3 2018 Remi Collet <remi@remirepo.net> - 2.8.0-2
 - update to 2.8.0
 - use range dependencies on F27+
-- 
cgit