align with PHP package

php-fpm/php-fpm.patch

@@ -1,6 +1,23 @@
+Index: ext/intl/msgformat/msgformat_helpers.cpp
+--- ext/intl/msgformat/msgformat_helpers.cpp.orig	2015-09-30 01:35:05.000000000 +0200
++++ ext/intl/msgformat/msgformat_helpers.cpp	2015-10-16 19:33:42.856986147 +0200
+@@ -62,11 +62,13 @@
+ #endif
+ };
+ 
++#if 0
+ const Formattable::Type*
+ MessageFormatAdapter::getArgTypeList(const MessageFormat& m,
+                                      int32_t& count) {
+     return m.getArgTypeList(count);
+ }
++#endif
+ 
+ #ifdef HAS_MESSAGE_PATTERN
+ const MessagePattern
 Index: ext/pdo_mysql/mysql_driver.c
---- ext/pdo_mysql/mysql_driver.c.orig	2015-01-21 01:40:37.000000000 +0100
-+++ ext/pdo_mysql/mysql_driver.c	2015-01-23 08:17:48.288783198 +0100
+--- ext/pdo_mysql/mysql_driver.c.orig	2015-09-30 01:35:05.000000000 +0200
++++ ext/pdo_mysql/mysql_driver.c	2015-10-16 19:28:25.525702213 +0200
 @@ -716,7 +716,7 @@
  			}
  		}
@@ -11,8 +28,8 @@ Index: ext/pdo_mysql/mysql_driver.c
  			char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
  			if (public_key) {
 Index: ext/pdo_mysql/pdo_mysql.c
---- ext/pdo_mysql/pdo_mysql.c.orig	2015-01-23 08:17:48.288783000 +0100
-+++ ext/pdo_mysql/pdo_mysql.c	2015-01-23 08:19:12.129123870 +0100
+--- ext/pdo_mysql/pdo_mysql.c.orig	2015-09-30 01:35:05.000000000 +0200
++++ ext/pdo_mysql/pdo_mysql.c	2015-10-16 19:28:25.525702213 +0200
 @@ -123,7 +123,7 @@
  	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
  	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
@@ -23,8 +40,8 @@ Index: ext/pdo_mysql/pdo_mysql.c
  #endif
  	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
 Index: ext/pdo_mysql/php_pdo_mysql_int.h
---- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2015-01-23 08:17:48.288783000 +0100
-+++ ext/pdo_mysql/php_pdo_mysql_int.h	2015-01-23 08:19:37.638772513 +0100
+--- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2015-09-30 01:35:05.000000000 +0200
++++ ext/pdo_mysql/php_pdo_mysql_int.h	2015-10-16 19:28:25.525702213 +0200
 @@ -171,7 +171,7 @@
  	PDO_MYSQL_ATTR_SSL_CA,
  	PDO_MYSQL_ATTR_SSL_CAPATH,

php-fpm/php-fpm.spec

@@ -32,7 +32,7 @@ Class:        BASE
 Group:        Web
 License:      PHP
 Version:      5.6.14
-Release:      20151002
+Release:      20151016
 
 #   package options
 %option       with_bc                   no
@@ -53,6 +53,7 @@ Release:      20151002
 %option       with_gmp                  no
 %option       with_iconv                no
 %option       with_imap                 no
+%option       with_intl                 no
 %option       with_json                 no
 %option       with_tokenizer            no
 %option       with_mbregex              no
@@ -197,6 +198,10 @@ PreReq:       libiconv
 BuildPreReq:  imap, openssl
 PreReq:       imap, openssl
 %endif
+%if "%{with_intl}" == "yes"
+BuildPreReq:  icu
+PreReq:       icu
+%endif
 %if "%{with_xml}" == "yes"
 BuildPreReq:  libxml
 PreReq:       libxml
@@ -292,7 +297,7 @@ PreReq:       gmp
     ldflags="%{l_ldflags}"
     libs=""
 %if "%{with_freetype}" == "yes"
-    cppflags="%{l_cppflags freetype .}"
+    cppflags="%{l_cppflags freetype .} $cppflags"
 %endif
 %if "%{with_gdbm}" == "yes"
     libs="$libs -lndbm -lgdbm"
@@ -309,6 +314,9 @@ PreReq:       gmp
 %if "%{with_imap}" == "yes"
     libs="$libs -lssl -lcrypto"
 %endif
+%if "%{with_intl}" == "yes"
+    cppflags="%{l_cppflags icu .} $cppflags"
+%endif
 %if "%{with_bdb}" == "yes"
     libs="$libs -ldb"
 %endif
@@ -350,7 +358,6 @@ PreReq:       gmp
         --with-sqlite3=%{l_prefix} \
         --with-pdo-sqlite=%{l_prefix} \
 %else
-        --without-sqlite3 \
         --without-pdo-sqlite \
 %endif
 %if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
@@ -428,6 +435,10 @@ PreReq:       gmp
         --with-imap=%{l_prefix} \
         --with-imap-ssl=%{l_prefix} \
 %endif
+%if "%{with_intl}" == "yes"
+        --enable-intl \
+        --with-icu-dir=%{l_prefix} \
+%endif
 %if "%{with_json}" == "yes"
         --enable-json \
 %else