From c21dae38420a57adc2c677a76d50a44db3c496bc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 24 Oct 2019 08:19:48 +0200
Subject: allow wildcards in ffi.preload

---
 php.spec | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 2964063..35ac5cc 100644
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 30%{?dist}
+Release: 31%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -174,11 +174,7 @@ Patch91: php-7.2.0-oci8conf.patch
 Patch300: php-7.0.10-datetests.patch
 
 # WIP
-Patch100: https://github.com/php/php-src/commit/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch
-Patch101: https://github.com/php/php-src/commit/1c9bfcb6a766d4062f2dd1e594b30831d59cc36c.patch
-Patch102: https://github.com/php/php-src/commit/1417352dda354c22db43a8d4dbaa967575e2720c.patch
-Patch103: https://github.com/php/php-src/commit/598bf7f5d5f9c76fd003590083c98736eb7702ab.patch
-Patch104: https://github.com/php/php-src/commit/dcd772325d0f7702a525f03c7d5dd04bf96d8e18.patch
+Patch100: php-ffi.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -951,10 +947,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 
 # WIP patch
 %patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1814,6 +1806,9 @@ fi
 
 
 %changelog
+* Thu Oct 24 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-31
+- allow wildcards in ffi.preload
+
 * Wed Oct 23 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc4-30
 - fix preload, add more upstream patches for #78713 #78716
 
-- 
cgit