From 0919614fac290555955505c12344177087b505d2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 26 Jun 2018 16:42:03 +0200
Subject: add patch for PHP 7.3 from
 https://github.com/pmjones/ext-request/pull/12

---
 php-pecl-request.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'php-pecl-request.spec')

diff --git a/php-pecl-request.spec b/php-pecl-request.spec
index 4d129ed..90b5ba8 100644
--- a/php-pecl-request.spec
+++ b/php-pecl-request.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-request
 #
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -19,12 +19,14 @@
 Summary:        Server-side request and response objects
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.0.0
-Release:        0.7.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        0.8.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/pmjones/ext-request/pull/12.patch
+
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 
@@ -32,7 +34,7 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 Requires:       %{?scl_prefix}php-spl%{?_isa}
 Requires:       %{?scl_prefix}php-date%{?_isa}
-%if 0%{?fedora} > 21
+%if 0%{?fedora} > 21 || 0%{?rhel} >= 8
 Recommends:     %{?scl_prefix}php-json%{?_isa}
 %else
 Requires:       %{?scl_prefix}php-json%{?_isa}
@@ -100,6 +102,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+%patch0 -p1 -b .pr12
 
 # Sanity check, really often broken
 extver=$(sed -n '/define PHP_REQUEST_VERSION/{s/.* "//;s/".*$//;p}' php_request.h)
@@ -169,7 +172,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -236,6 +239,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 1.0.0-0.8.b2
+- add patch for PHP 7.3 from
+  https://github.com/pmjones/ext-request/pull/12
+
 * Tue Aug  1 2017 Remi Collet <remi@remirepo.net> - 1.0.0-0.7.b2
 - update to 1.0.0b2 (beta)
 
-- 
cgit