- added -phpize_fixes.patch - pulled out from cvs.php.net (fixes build

  of pecl extensions)

Changed files:
    php-phpize_fixes.patch -> 1.1
    php.spec -> 1.301

diff --git a/php-phpize_fixes.patch b/php-phpize_fixes.patch
new file mode 100644 (file)
index 0000000..1e6ad6a
--- /dev/null
+++ b/php-phpize_fixes.patch
@@ -0,0 +1,30 @@
+===================================================================
+RCS file: /repository/php-src/scripts/phpize.in,v
+retrieving revision 1.1.2.7
+retrieving revision 1.1.2.9
+diff -p --unified=3 -r1.1.2.7 -r1.1.2.9
+--- scripts/phpize.in  2003/08/27 17:57:32     1.1.2.7
++++ scripts/phpize.in  2003/11/14 03:21:15     1.1.2.9
+@@ -10,7 +10,7 @@ FILES="acinclude.m4 Makefile.global"
+ CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \
+     mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+       aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \
+-      config.log config.status Makefile Makefile.fragments Makefile.objects"
++      config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h"
+
+ case "$1" in
+   # Cleanup
+@@ -57,6 +57,13 @@ touch install-sh mkinstalldirs missing
+ aclocal || exit 1
+ autoconf || exit 1
+ autoheader || exit 1
++test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
++if test ! -x $builddir/build/shtool; then
++  echo "shtool at '$builddir/build/shtool' not executable. "
++  echo "Make sure that the file exists and is executable and then rerun this script. "
++  echo
++  exit 1
++fi
+ libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
+ $libtoolize -f -c || exit 1
+

diff --git a/php.spec b/php.spec
index 41fe7c624c26b7363ce50e498135bd06afbb3c09..7dd124b8c36abc974037d206810ce42f6dc3f5a2 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -110,6 +110,7 @@ Patch27:    %{name}-zlib.patch
 Patch28:       %{name}-db-shared.patch
 Patch29:       %{name}-sybase-fix.patch
 Patch30:       %{name}-mssql-fix.patch
+Patch31:       %{name}-phpize_fixes.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{!?_without_interbase:%{!?_with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
@@ -1506,6 +1507,7 @@ cp php.ini-dist php.ini
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p0
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"