summaryrefslogtreecommitdiffstats
path: root/php56.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-06-05 15:14:01 +0200
committerRemi Collet <fedora@famillecollet.com>2014-06-05 15:14:01 +0200
commit6eecd5405d3fb42390641ca958d9ca558ed8ab46 (patch)
tree437e312dbfc2ea082d25b3d03062f658e04040aa /php56.spec
parent3f23cfa892e578c42ac7d5dca3cd63a70e4a9b69 (diff)
PHP 5.6: fix regression introduce in fix for #67118
Diffstat (limited to 'php56.spec')
-rw-r--r--php56.spec7
1 files changed, 6 insertions, 1 deletions
diff --git a/php56.spec b/php56.spec
index 60060ec..303bfd5 100644
--- a/php56.spec
+++ b/php56.spec
@@ -124,7 +124,7 @@ Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.6.0
%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.9.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.10.%{?snapdate}%{?rcver}%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -185,6 +185,7 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-reg67118.patch
# Security fixes (200+)
@@ -907,6 +908,7 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .reg67118
# security patches
@@ -1909,6 +1911,9 @@ fi
%changelog
+* Thu Jun 5 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.10.beta4
+- fix regression introduce in fix for #67118
+
* Wed Jun 4 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.9.beta4
- php 5.6.0beta4