[packages/php/PHP_5_6: 3/4] Merge branch 'mysqlnd-link' into PHP_5_6
glen
glen at pld-linux.org
Fri Oct 17 14:46:04 CEST 2014
commit 0cf0fd40bd27b1e613f8eff8fcf15b9d78c36e9c
Merge: 57cfa83 5467be0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Oct 17 15:45:20 2014 +0300
Merge branch 'mysqlnd-link' into PHP_5_6
Conflicts:
php.spec
mysqlnd-ssl.patch | 24 ++++++++++++++++++++++++
php.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --cc php.spec
index b4d41bb,277aa8b..48498c0
--- a/php.spec
+++ b/php.spec
@@@ -2053,7 -2054,8 +2054,8 @@@ cp -p php.ini-production php.in
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
%patch67 -p1
-%patch69 -p1
+%{?with_fpm:%patch69 -p1}
+ %patch70 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/7b45fed83b037d5811d2308a8fabdd6f346b4982
More information about the pld-cvs-commit
mailing list