summaryrefslogtreecommitdiffstats
path: root/php74.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-24 08:20:00 +0200
committerRemi Collet <remi@remirepo.net>2019-10-24 08:20:00 +0200
commite5f40da8075b343c3211e09a092d2519d7d4952f (patch)
tree120563b810cb5662dd0e433c7d6070fe1aa0324f /php74.spec
parent936c7462fc412475b9277dd939ebf073ca410974 (diff)
allow wildcards in ffi.preload
Diffstat (limited to 'php74.spec')
-rw-r--r--php74.spec15
1 files changed, 5 insertions, 10 deletions
diff --git a/php74.spec b/php74.spec
index 14dc5fe..b503e31 100644
--- a/php74.spec
+++ b/php74.spec
@@ -103,7 +103,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{lower}}
-Release: 11%{?dist}
+Release: 12%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -168,11 +168,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
@@ -1170,10 +1166,6 @@ in pure PHP.
# WIP patch
%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -2162,6 +2154,9 @@ fi
%changelog
+* Thu Oct 24 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-12
+- allow wildcards in ffi.preload
+
* Wed Oct 23 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-11
- fix preload, add more upstream patches for #78713 #78716