From 2f62be34f9e86d38ddc02677c3c0b2bad4defa6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 13 Feb 2014 12:35:13 +0100 Subject: [PATCH] - dropped, no longer needed --- php-freetype.patch | 11 ----------- php.spec | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 php-freetype.patch diff --git a/php-freetype.patch b/php-freetype.patch deleted file mode 100644 index 8253d62..0000000 --- a/php-freetype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.3.27/ext/gd/config.m4~ 2013-07-10 19:43:08.000000000 +0200 -+++ php-5.3.27/ext/gd/config.m4 2013-12-12 14:38:29.753000608 +0100 -@@ -162,7 +162,7 @@ - if test "$PHP_FREETYPE_DIR" != "no"; then - - for i in $PHP_FREETYPE_DIR /usr/local /usr; do -- if test -f "$i/include/freetype2/freetype/freetype.h"; then -+ if test -f "$i/include/freetype2/freetype.h"; then - FREETYPE2_DIR=$i - FREETYPE2_INC_DIR=$i/include/freetype2 - break diff --git a/php.spec b/php.spec index f2ccb57..c669ddd 100644 --- a/php.spec +++ b/php.spec @@ -218,7 +218,7 @@ Patch63: %{orgname}-mysql-nowarning.patch Patch65: system-libzip.patch Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch -Patch68: php-freetype.patch + Patch69: fpm-conf-split.patch URL: http://www.php.net/ %{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} @@ -1956,7 +1956,7 @@ cp -p php.ini-production php.ini %{?with_system_libzip:%patch65 -p1} %patch66 -p1 %patch67 -p1 -#%patch68 -p1 + %patch69 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 -- 2.44.0