Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	php4.spec
@@ -114,6 +114,9 @@ Patch126: php-4.4.8-php_ini.patch Patch127: php-4.4.8-pspell_test.patch +# Added for PHP 4.4.9 +Patch128: php-4.4.9-pcre-x86_64.patch + BuildRoot: %{_tmppath}/%{name}-root BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel @@ -445,6 +448,11 @@ %patch126 -p1 -b .phpini %patch127 -p1 -b .pspelltest +# php 4.4.9 patches +%ifarch x86_64 +%patch128 -p0 -b .pcre-64 +%endif + # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE cp TSRM/LICENSE TSRM_LICENSE x 1 @@ -114,6 +114,9 @@ 2 Patch126: php-4.4.8-php_ini.patch 3 Patch127: php-4.4.8-pspell_test.patch 4 5 +# Added for PHP 4.4.9 6 +Patch128: php-4.4.9-pcre-x86_64.patch 7 + 8 BuildRoot: %{_tmppath}/%{name}-root 9 10 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel 11 @@ -445,6 +448,11 @@ 12 %patch126 -p1 -b .phpini 13 %patch127 -p1 -b .pspelltest 14 15 +# php 4.4.9 patches 16 +%ifarch x86_64 17 +%patch128 -p0 -b .pcre-64 18 +%endif 19 + 20 # Prevent %%doc confusion over LICENSE files 21 cp Zend/LICENSE Zend/ZEND_LICENSE 22 cp TSRM/LICENSE TSRM_LICENSE 23
[-] [+]	Added	php-4.4.9-pcre-x86_64.patch ^
@@ -0,0 +1,11 @@ +--- ext/pcre/config0.m4.orig 2008-10-29 12:21:23.000000000 +0100 ++++ ext/pcre/config0.m4 2008-07-17 16:27:52.000000000 +0200 +@@ -32,7 +32,7 @@ + AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) + fi + +- for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib64; do ++ for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do + test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j + done +