Changes of Revision 15
| [-] | Changed | php4.spec |
|
x 1 2 Patch130: php-4.4.9-gd-x86_64.patch3 Patch131: php-4.4.9-imap-x86_64.patch4 Patch132: php-4.4.9-krb-x86_64.patch5 +Patch133: php-4.4.9-domxml-x86_64.patch6 +Patch134: php-4.4.9-gettext-x86_64.patch7 +Patch135: php-4.4.9-ldap-x86_64.patch8 +Patch136: php-4.4.9-mysql-x86_64.patch9 +Patch137: php-4.4.9-pgsql-x86_64.patch10 +Patch138: php-4.4.9-snmp-x86_64.patch11 +Patch139: php-4.4.9-xmlrpc-x86_64.patch12 +Patch140: php-4.4.9-xml-x86_64.patch13 +14 BuildRoot: %{_tmppath}/%{name}-root15 16 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel17 18 %patch130 -p0 -b .gd-6419 %patch131 -p0 -b .imap-6420 %patch132 -p1 -b .krb-6421 +%patch133 -p0 -b .domxml-6422 +%patch134 -p0 -b .gettext-6423 +%patch135 -p0 -b .ldap-6424 +%patch136 -p0 -b .mysql-6425 +%patch137 -p0 -b .pgsql-6426 +%patch138 -p0 -b .snmp-6427 +%patch139 -p0 -b .xmlrpc-6428 +%patch140 -p0 -b .xml-6429 %endif30 31 # Prevent %%doc confusion over LICENSE files32 |
||
| [+] | Added | php-4.4.9-domxml-x86_64.patch ^ |
| @@ -0,0 +1,69 @@ +--- ext/domxml/config.m4.orig 2009-08-08 16:34:44.000000000 +0200 ++++ ext/domxml/config.m4 2009-08-08 16:36:36.000000000 +0200 +@@ -50,7 +50,7 @@ + + PHP_DOM_CHECK_VERSION + +- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then ++ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then + DOM_LIBNAME=xml2 + else + DOM_LIBNAME=xml +@@ -62,7 +62,7 @@ + DOM_LIBS=`$XML2_CONFIG --libs` + PHP_EVAL_LIBLINE($DOM_LIBS, DOMXML_SHARED_LIBADD) + else +- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) + fi + + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) +@@ -70,7 +70,7 @@ + if test "$PHP_ZLIB_DIR" = "no"; then + AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>) + else +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, DOMXML_SHARED_LIBADD) + fi + + AC_DEFINE(HAVE_DOMXML,1,[ ]) +@@ -137,7 +137,7 @@ + + PHP_DOM_XSLT_CHECK_VERSION + +- PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib64, DOMXML_SHARED_LIBADD) + + PHP_ADD_INCLUDE($DOMXSLT_DIR/include) + +@@ -145,17 +145,17 @@ + AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>) + fi + +- if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then ++ if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then + DOM_LIBNAME=xml2 + else + DOM_LIBNAME=xml + fi + +- PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) + +- if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then +- PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) ++ if test -f $DOMXML_DIR/lib64/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib64/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then ++ PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXML_DIR/lib64, DOMXML_SHARED_LIBADD) + fi + + AC_DEFINE(HAVE_DOMXSLT,1,[ ]) +@@ -187,7 +187,7 @@ + + PHP_DOM_EXSLT_CHECK_VERSION + +- PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib64, DOMXML_SHARED_LIBADD) + + PHP_ADD_INCLUDE($DOMEXSLT_DIR/include) + | ||
| [+] | Added | php-4.4.9-gettext-x86_64.patch ^ |
| @@ -0,0 +1,11 @@ +--- ext/gettext/config.m4.orig 2009-08-08 16:40:53.000000000 +0200 ++++ ext/gettext/config.m4 2009-08-08 16:41:09.000000000 +0200 +@@ -14,7 +14,7 @@ + AC_MSG_ERROR(Cannot locate header file libintl.h) + fi + +- GETTEXT_LIBDIR=$GETTEXT_DIR/lib ++ GETTEXT_LIBDIR=$GETTEXT_DIR/lib64 + GETTEXT_INCDIR=$GETTEXT_DIR/include + + O_LDFLAGS=$LDFLAGS | ||
| [+] | Added | php-4.4.9-ldap-x86_64.patch ^ |
| @@ -0,0 +1,21 @@ +--- ext/ldap/config.m4.orig 2009-08-08 16:31:47.000000000 +0200 ++++ ext/ldap/config.m4 2009-08-08 16:32:16.000000000 +0200 +@@ -6,15 +6,15 @@ + if test -f $1/include/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + elif test -f $1/include/umich-ldap/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include/umich-ldap +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + elif test -f $1/ldap/public/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/ldap/public +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + fi + ]) + | ||
| [+] | Added | php-4.4.9-mysql-x86_64.patch ^ |
| @@ -0,0 +1,23 @@ +--- ext/mysql/config.m4.orig 2009-08-08 16:38:29.000000000 +0200 ++++ ext/mysql/config.m4 2009-08-08 16:39:30.000000000 +0200 +@@ -121,7 +121,7 @@ + ;; + esac + +- for i in lib lib/mysql; do ++ for i in lib64 lib64/mysql; do + MYSQL_LIB_CHK($i) + done + +@@ -136,9 +136,9 @@ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ + AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) + ], [ +- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR ++ -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR + ]) +- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" ++ MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" + else + PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ | ||
| [+] | Added | php-4.4.9-pgsql-x86_64.patch ^ |
| @@ -0,0 +1,11 @@ +--- ext/pgsql/config.m4.orig 2009-08-08 16:40:01.000000000 +0200 ++++ ext/pgsql/config.m4 2009-08-08 16:40:18.000000000 +0200 +@@ -46,7 +46,7 @@ + fi + done + +- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do ++ for j in lib lib64/pgsql lib64/postgres lib64/postgresql ""; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi | ||
| [+] | Added | php-4.4.9-snmp-x86_64.patch ^ |
| @@ -0,0 +1,17 @@ +--- ext/snmp/config.m4.orig 2009-08-08 16:33:49.000000000 +0200 ++++ ext/snmp/config.m4 2009-08-08 16:34:13.000000000 +0200 +@@ -46,12 +46,12 @@ + test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp + done + for i in /usr /usr/snmp /usr/local /usr/local/snmp; do +- test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib ++ test -f $i/lib64/libsnmp.a -o -f $i/lib64/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib64 + done + else + SNMP_INCDIR=$PHP_SNMP/include + test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp +- SNMP_LIBDIR=$PHP_SNMP/lib ++ SNMP_LIBDIR=$PHP_SNMP/lib64 + fi + + if test -z "$SNMP_INCDIR"; then | ||
| [+] | Added | php-4.4.9-xml-x86_64.patch ^ |
| @@ -0,0 +1,20 @@ +--- ext/xml/config.m4.orig 2009-08-08 16:33:05.000000000 +0200 ++++ ext/xml/config.m4 2009-08-08 16:33:21.000000000 +0200 +@@ -31,7 +31,7 @@ + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + + for i in $PHP_XML $PHP_EXPAT_DIR; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then ++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then + EXPAT_DIR=$i + fi + done +@@ -41,7 +41,7 @@ + fi + + PHP_ADD_INCLUDE($EXPAT_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) + PHP_SUBST(XML_SHARED_LIBADD) + fi + fi | ||
| [+] | Added | php-4.4.9-xmlrpc-x86_64.patch ^ |
| @@ -0,0 +1,21 @@ +--- ext/xmlrpc/config.m4.orig 2009-08-08 16:37:05.000000000 +0200 ++++ ext/xmlrpc/config.m4 2009-08-08 16:37:41.000000000 +0200 +@@ -23,9 +23,9 @@ + + testval=no + for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) + PHP_ADD_INCLUDE($i/include) + testval=yes + break +@@ -88,5 +88,5 @@ + fi + + PHP_ADD_INCLUDE($XMLRPC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) + fi | ||