Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	php5-expect.spec
@@ -21,6 +21,7 @@ # URL: http://pecl.php.net/ Source: http://pecl.php.net/package/%{pkg_name}/%{pkg_name}-%{version}.tgz +Patch0: expect-x86_64_%{version}.patch Summary: Expect extension %description @@ -35,6 +36,7 @@ %prep %setup -n %{pkg_name}-%{version} +%patch0 %{__mkdir} %{name} x 1 @@ -21,6 +21,7 @@ 2 # 3 URL: http://pecl.php.net/ 4 Source: http://pecl.php.net/package/%{pkg_name}/%{pkg_name}-%{version}.tgz 5 +Patch0: expect-x86_64_%{version}.patch 6 Summary: Expect extension 7 8 %description 9 @@ -35,6 +36,7 @@ 10 11 %prep 12 %setup -n %{pkg_name}-%{version} 13 +%patch0 14 15 %{__mkdir} %{name} 16 17
[-] [+]	Added	expect-x86_64_0.3.3.patch ^
@@ -0,0 +1,23 @@ +--- config.m4.orig 2016-01-11 10:00:55.745951515 +0100 ++++ config.m4 2016-01-11 10:04:09.401276824 +0100 +@@ -32,6 +32,11 @@ + break + fi + done ++ for i in $PHP_EXPECT/bin/expect $PHP_EXPECT/local/bin/expect ; do ++ if test -x $i ; then ++ EXPECT_VERSION=`$i -v \| awk '{print $NF}'` ++ fi ++ done + if test -n "$TCL_VERSION" ; then + AC_MSG_RESULT($TCL_VERSION in $TCL_PREFIX) + else +@@ -39,7 +44,7 @@ + fi + + PHP_ADD_LIBRARY_WITH_PATH(tcl$TCL_VERSION, $TCL_PREFIX/$PHP_LIBDIR, EXPECT_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(expect, $LIBEXPECT_DIR/$PHP_LIBDIR, EXPECT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expect$EXPECT_VERSION, $LIBEXPECT_DIR/$PHP_LIBDIR, EXPECT_SHARED_LIBADD) + PHP_ADD_INCLUDE($LIBEXPECT_INCLUDE_DIR) + + PHP_NEW_EXTENSION(expect, expect.c expect_fopen_wrapper.c, $ext_shared)