summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-27 09:08:48 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-27 09:08:48 +0100
commit337d8f80699293574497314257d026a7bc5cc72a (patch)
treefb1d6f52b1d34876b93fd7eb1d9cff04b612d583
parent49e98618f6f10a609e6531d639d3c17a1f8e888e (diff)
php and php56-php 5.6.4RC1
-rw-r--r--php56.spec19
1 files changed, 7 insertions, 12 deletions
diff --git a/php56.spec b/php56.spec
index 3237fe1..c880305 100644
--- a/php56.spec
+++ b/php56.spec
@@ -127,15 +127,15 @@
%endif
#global snapdate 201405061030
-#global rcver RC1
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.6.3
+Version: 5.6.4
%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.4.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.1.%{?snapdate}%{?rcver}%{?dist}
%else
-Release: 3%{?dist}
+Release: 1%{?dist}
%endif
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -197,10 +197,6 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-bug68419.patch
-Patch101: php-bug68423.patch
-Patch102: php-bug68421.patch
-Patch103: php-bug68420.patch
# Security fixes (200+)
@@ -958,10 +954,6 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .bug68419
-%patch101 -p1 -b .bug68423
-%patch102 -p1 -b .bug68421
-%patch103 -p1 -b .bug68420
# security patches
@@ -1951,6 +1943,9 @@ fi
%changelog
+* Thu Nov 27 2014 Remi Collet <rcollet@redhat.com> 5.6.4-0.1.RC1
+- php 5.6.4RC1
+
* Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-3
- FPM: add upstream patch for https://bugs.php.net/68421
access.format=R doesn't log ipv6 address