summaryrefslogtreecommitdiffstats
path: root/php56.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-07-30 17:04:07 +0200
committerRemi Collet <fedora@famillecollet.com>2014-07-30 17:04:07 +0200
commit3e75ec94a9db78ca8e5ea4a50c844b188f6a8fc1 (patch)
treefaa3a80de8acd4d012f5b8e9e30f229d714dc266 /php56.spec
parenta7c33d4b6b8adc746bb83d4732a29d5ef6385542 (diff)
PHP 5.6.0RC3
Diffstat (limited to 'php56.spec')
-rw-r--r--php56.spec13
1 files changed, 4 insertions, 9 deletions
diff --git a/php56.spec b/php56.spec
index 4c51fe8..25a216d 100644
--- a/php56.spec
+++ b/php56.spec
@@ -112,13 +112,13 @@
%endif
#global snapdate 201405061030
-%global rcver RC2
+%global rcver RC3
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.6.0
%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.19.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.20.%{?snapdate}%{?rcver}%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -181,8 +181,6 @@ Patch48: php-5.6.0-mock.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-man.patch
-Patch101: php-syslog.patch
# Security fixes (200+)
@@ -193,7 +191,6 @@ Patch301: php-5.6.0-oldpcre.patch
Patch302: php-5.6.0-noNO.patch
# WIP
-Patch400: php-systemd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -883,8 +880,6 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .manpath
-%patch101 -p1 -b .syslog
# security patches
@@ -898,7 +893,6 @@ rm -rf ext/json
%patch302 -p0 -b .971416
# WIP patch
-%patch400 -p1 -b .systemd
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1838,7 +1832,8 @@ fi
%changelog
-* Wed Jul 30 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.19.RC2
+* Wed Jul 30 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.20.RC3
+- php 5.6.0RC3
- fix license handling
- fix zts-php-config --php-binary output #1124605
- cleanup with_libmysql