- rel 49; fixed icu build

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 43f375d33fd770272495998e2ee5d89a9eef8d14..b33173139ad739b2f06f1dce834df2b9af26ef25 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -143,7 +143,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_alternatives
 %endif
 
-%define                rel     42
+%define                rel     49
 %define                orgname php
 %define                ver_suffix 53
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -249,6 +249,8 @@ Patch72:    x32-suhosin.patch
 Patch73:       php-bug-68486.patch
 Patch74:       mysqli-err.patch
 Patch75:       openssl.patch
+Patch76:       php-bug-61930.patch
+Patch77:       php-icu64.patch
 # Fixes for security bugs
 # https://repo.webtatic.com/yum/centos/5/SRPMS/repoview/php.html
 # also from RHEL6/CentOS7
@@ -269,6 +271,7 @@ Patch258:   php-5.3.29-CVE-2015-0232.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
+BuildRequires: apache-base
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1.4d
 BuildRequires: bison
@@ -280,9 +283,11 @@ BuildRequires:     elfutils-devel
 %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3}
 BuildRequires: file
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+BuildRequires: libatomic-devel
 %{?with_system_libzip:BuildRequires:   libzip-devel >= 0.10-3}
 BuildRequires: mysql-devel
 BuildRequires: pkgconfig
+BuildRequires: re2c
 BuildRequires: sed >= 4.0
 %if %{with mssql} || %{with sybase_ct}
 BuildRequires: freetds-devel >= 0.82
@@ -2144,6 +2149,8 @@ gzip -dc %{SOURCE15} | tar xf - -C sapi/
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
+%patch77 -p1
 
 %patch220 -p1
 
@@ -2300,7 +2307,7 @@ if [ ! -f _built-conf ]; then
        touch _built-conf
 fi
 export PROG_SENDMAIL="/usr/lib/sendmail"
-export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} -I%{_includedir}/xmlrpc-epi"
+export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP -DOPENSSL_NO_SSL2=1 -DOPENSSL_NO_SSL3=1 %{rpmcppflags} -I%{_includedir}/xmlrpc-epi"
 %if %{with lfs}
 CPPFLAGS="$CPPFLAGS $(getconf LFS_CFLAGS)"
 %endif