summaryrefslogtreecommitdiffstats
path: root/php54.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-08-22 08:28:39 +0200
committerRemi Collet <fedora@famillecollet.com>2013-08-22 08:28:39 +0200
commit18b87509e62dab3f6d56f143d1221acbf9a29f7c (patch)
treea2beafd50172ab6594f628f2e74154da8b18fb3c /php54.spec
parentfd4d1afde90d94006397e86d2d161dd88d114a2c (diff)
PHP 5.4.19
Diffstat (limited to 'php54.spec')
-rw-r--r--php54.spec18
1 files changed, 4 insertions, 14 deletions
diff --git a/php54.spec b/php54.spec
index d32a548..0cb8b7d 100644
--- a/php54.spec
+++ b/php54.spec
@@ -75,7 +75,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.4.18
+Version: 5.4.19
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.5.%{?snapdate}%{?rcver}%{?dist}
%else
@@ -109,8 +109,6 @@ Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
Patch8: php-5.4.7-libdb.patch
-# Patch for https://bugs.php.net/65460
-Patch9: php-5.4.18-bison.patch
# Fixes for extension modules
# https://bugs.php.net/63171 no odbc call during timeout
@@ -159,8 +157,6 @@ BuildRequires: libtool-ltdl-devel
%if %{with_libzip}
BuildRequires: libzip-devel >= 0.10
%endif
-# Temporary for need for https://bugs.php.net/65460
-BuildRequires: bison
Obsoletes: php53, php53u, php54
Provides: php-zts = %{version}-%{release}
@@ -770,10 +766,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch7 -p1 -b .recode
%patch8 -p1 -b .libdb
rm -f ext/json/utf8_to_utf16.*
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-# bison >= 2.4
-%patch9 -p1 -b .bison
-%endif
%patch21 -p1 -b .odbctimer
@@ -794,11 +786,6 @@ rm -f ext/json/utf8_to_utf16.*
%patch91 -p1 -b .remi-oci8
-# Temporary workaround for https://bugs.php.net/65460
-# Regenerated bison files
-rm Zend/zend_{language,ini}_parser.[ch]
-./genfiles
-
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1641,6 +1628,9 @@ fi
%changelog
+* Thu Aug 22 2013 Remi Collet <rcollet@redhat.com> - 5.4.19-1
+- update to 5.4.19
+
* Mon Aug 19 2013 Remi Collet <remi@fedoraproject.org> 5.4.18-1
- update to 5.4.18, fix for CVE-2013-4248
- php-oci8 build with oracle instantclient 12.1