diff options
author | Remi Collet <fedora@famillecollet.com> | 2015-04-18 10:43:10 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2015-04-18 10:43:10 +0200 |
commit | 97b4f1e66a8b8bbbcb6513152e4f3db489c450e1 (patch) | |
tree | 53c5e37770aafcd440acc90d4e63ba3a82611b90 /php55.spec | |
parent | 1474f47656ebc2f91db499e3f5207f5d8068cad6 (diff) |
php 5.5: backport patch from 5.6 for date tests
Diffstat (limited to 'php55.spec')
-rw-r--r-- | php55.spec | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -193,10 +193,10 @@ Patch91: php-5.3.7-oci8conf.patch # Security fixes (200+) # Fixes for tests (300+) +# Factory is droped from system tzdata + upstream patch for new zic +Patch300: php-5.5.24-datetests.patch # Revert change for pcre 8.34 Patch301: php-5.5.10-pcre834.patch -# see https://bugzilla.redhat.com/971416 -Patch302: php-5.5.14-noNO.patch # WIP @@ -947,13 +947,13 @@ rm -rf ext/json # security patches # Fixes for tests +%patch300 -p1 -b .datetests %if %{with_libpcre} %if 0%{?fedora} < 21 # Only apply when system libpcre < 8.34 %patch301 -p1 -R -b .pcre84 %endif %endif -%patch302 -p0 -b .971416 # WIP patch |