Changes - j0ke.net Open Build Service

Changes of Revision 8

[-] [+]	Changed	php5-rrdtool.spec
@@ -17,12 +17,16 @@ # URL: http://oss.oetiker.ch/rrdtool/pub/contrib/ Source: %{pkg_name}.tgz +Patch: php5-rrdtool-lib64.diff Summary: PHP rrdtool integration %description %debug_package %prep %setup -q -n rrdtool +%ifarch x86_64 +%patch +%endif %{__mkdir} %{name} x 1 @@ -17,12 +17,16 @@ 2 # 3 URL: http://oss.oetiker.ch/rrdtool/pub/contrib/ 4 Source: %{pkg_name}.tgz 5 +Patch: php5-rrdtool-lib64.diff 6 Summary: PHP rrdtool integration 7 %description 8 9 %debug_package 10 %prep 11 %setup -q -n rrdtool 12 +%ifarch x86_64 13 +%patch 14 +%endif 15 16 %{__mkdir} %{name} 17 18
[-] [+]	Added	php5-rrdtool-lib64.diff ^
@@ -0,0 +1,24 @@ +--- config.m4.orig 2008-06-12 00:02:16.000000000 +0200 ++++ config.m4 2008-06-12 00:03:07.000000000 +0200 +@@ -16,10 +16,10 @@ + + if test "$PHP_RRDTOOL" != "yes"; then + AC_MSG_CHECKING(if rrdtool specified path is valid) +- if test -r $PHP_RRDTOOL/include/rrd.h && test -f $PHP_RRDTOOL/lib/librrd.$SHLIB_SUFFIX_NAME -o -f $PHP_RRDTOOL/lib/librrd.a; then # path given as parameter ++ if test -r $PHP_RRDTOOL/include/rrd.h && test -f $PHP_RRDTOOL/lib64/librrd.$SHLIB_SUFFIX_NAME -o -f $PHP_RRDTOOL/lib64/librrd.a; then # path given as parameter + RRDTOOL_DIR=$PHP_RRDTOOL + RRDTOOL_INCDIR=$PHP_RRDTOOL/include +- RRDTOOL_LIBDIR=$PHP_RRDTOOL/lib ++ RRDTOOL_LIBDIR=$PHP_RRDTOOL/lib64 + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -41,7 +41,7 @@ + dnl Library path + AC_MSG_CHECKING([for rrdtool library files in default path]) + for i in librrd.$SHLIB_SUFFIX_NAME librrd.a; do +- test -f $RRDTOOL_DIR/lib/$i && RRDTOOL_LIBDIR=$RRDTOOL_DIR/lib ++ test -f $RRDTOOL_DIR/lib64/$i && RRDTOOL_LIBDIR=$RRDTOOL_DIR/lib64 + done + if test -z "$RRDTOOL_LIBDIR"; then + AC_MSG_RESULT([not found])