summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-01-20 08:23:21 +0100
committerRemi Collet <fedora@famillecollet.com>2017-01-20 08:23:21 +0100
commiteea960c13a32383939d6bde303165a7cf6aa78ef (patch)
tree3968e39625091978dcdcf48caaaa6e40f3524ae8 /php.spec
parent885ce9b409d2a4124898d380d68421286689db86 (diff)
php 5.6.30 make DTrace optional (backported from PHP 7)
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index f809842..eff52a7 100644
--- a/php.spec
+++ b/php.spec
@@ -138,7 +138,7 @@
%endif
#global rcver RC1
-%global rpmrel 1
+%global rpmrel 2
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -181,6 +181,7 @@ Patch9: php-5.5.30-curl.patch
# Functional changes
Patch40: php-5.4.0-dlopen.patch
+Patch41: php-5.6.30-dtrace.patch
Patch42: php-5.6.13-systzdata-v12.patch
# See http://bugs.php.net/53436
Patch43: php-5.4.0-phpize.patch
@@ -882,6 +883,7 @@ support for using the enchant library to PHP.
%endif
%patch40 -p1 -b .dlopen
+%patch41 -p1 -b .dtrace
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
%patch42 -p1 -b .systzdata
%endif
@@ -1818,6 +1820,10 @@ fi
%changelog
+* Fri Jan 20 2017 Remi Collet <remi@fedoraproject.org> 5.6.30-2
+- disable dtrace by default, this may be enabled again using
+ environment variable USE_ZEND_DTRACE=1, backported from PHP 7
+
* Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> 5.6.30-1
- Update to 5.6.30 - http://www.php.net/releases/5_6_30.php