From 2b2e42f5b4b46e8ae70fea4bc54d670bd4e40f3f Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 4 Feb 2009 11:39:55 +0000 Subject: [PATCH] * Wed Feb 4 2009 Joe Orton 5.2.8-8 - fix patch fuzz, renumber patches --- php-5.2.4-odbc.patch | 11 ----- ...2.6-gnusrc.patch => php-5.2.8-gnusrc.patch | 40 +++++++-------- ...3-install.patch => php-5.2.8-install.patch | 8 +-- ...phpize64.patch => php-5.2.8-phpize64.patch | 13 ++--- php.spec | 49 ++++++++++--------- 5 files changed, 55 insertions(+), 66 deletions(-) delete mode 100644 php-5.2.4-odbc.patch rename php-5.2.6-gnusrc.patch => php-5.2.8-gnusrc.patch (65%) rename php-4.3.3-install.patch => php-5.2.8-install.patch (56%) rename php-5.0.2-phpize64.patch => php-5.2.8-phpize64.patch (67%) diff --git a/php-5.2.4-odbc.patch b/php-5.2.4-odbc.patch deleted file mode 100644 index 99681a6..0000000 --- a/php-5.2.4-odbc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.2.4/ext/odbc/config.m4.odbc -+++ php-5.2.4/ext/odbc/config.m4 -@@ -423,6 +423,8 @@ PHP_ARG_WITH(unixODBC,, - PHP_ODBC_CHECK_HEADER(sqlext.h) - AC_DEFINE(HAVE_UNIXODBC,1,[ ]) - AC_MSG_RESULT([$ext_output]) -+ ODBC_SHARED_LIBADD="-lodbc -lodbcpsql" -+ PHP_SUBST(ODBC_SHARED_LIBADD) - fi - fi - diff --git a/php-5.2.6-gnusrc.patch b/php-5.2.8-gnusrc.patch similarity index 65% rename from php-5.2.6-gnusrc.patch rename to php-5.2.8-gnusrc.patch index 1e02bdd..9bad214 100644 --- a/php-5.2.6-gnusrc.patch +++ b/php-5.2.8-gnusrc.patch @@ -1,5 +1,5 @@ ---- php-5.2.6/configure.in.gnusrc -+++ php-5.2.6/configure.in +--- php-5.2.8/configure.in.gnusrc ++++ php-5.2.8/configure.in @@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl @@ -9,8 +9,8 @@ dnl Setting up the PHP version based on the information above. dnl ------------------------------------------------------------------------- ---- php-5.2.6/ext/interbase/interbase.c.gnusrc -+++ php-5.2.6/ext/interbase/interbase.c +--- php-5.2.8/ext/interbase/interbase.c.gnusrc ++++ php-5.2.8/ext/interbase/interbase.c @@ -24,7 +24,6 @@ #include "config.h" #endif @@ -19,8 +19,8 @@ #include "php.h" ---- php-5.2.6/ext/pdo_firebird/firebird_driver.c.gnusrc -+++ php-5.2.6/ext/pdo_firebird/firebird_driver.c +--- php-5.2.8/ext/pdo_firebird/firebird_driver.c.gnusrc ++++ php-5.2.8/ext/pdo_firebird/firebird_driver.c @@ -22,7 +22,6 @@ #include "config.h" #endif @@ -29,8 +29,8 @@ #include "php.h" #include "php_ini.h" ---- php-5.2.6/ext/standard/file.c.gnusrc -+++ php-5.2.6/ext/standard/file.c +--- php-5.2.8/ext/standard/file.c.gnusrc ++++ php-5.2.8/ext/standard/file.c @@ -118,7 +118,6 @@ php_file_globals file_globals; #ifdef HAVE_FNMATCH @@ -39,8 +39,8 @@ #endif #include #endif ---- php-5.2.6/ext/zlib/zlib_fopen_wrapper.c.gnusrc -+++ php-5.2.6/ext/zlib/zlib_fopen_wrapper.c +--- php-5.2.8/ext/zlib/zlib_fopen_wrapper.c.gnusrc ++++ php-5.2.8/ext/zlib/zlib_fopen_wrapper.c @@ -19,7 +19,6 @@ /* $Id$ */ @@ -49,8 +49,8 @@ #include "php.h" #include "php_zlib.h" ---- php-5.2.6/main/php.h.gnusrc -+++ php-5.2.6/main/php.h +--- php-5.2.8/main/php.h.gnusrc ++++ php-5.2.8/main/php.h @@ -30,6 +30,7 @@ #define PHP_HAVE_STREAMS #define YYDEBUG 0 @@ -59,8 +59,8 @@ #include "php_version.h" #include "zend.h" #include "zend_qsort.h" ---- php-5.2.6/main/streams/cast.c.gnusrc -+++ php-5.2.6/main/streams/cast.c +--- php-5.2.8/main/streams/cast.c.gnusrc ++++ php-5.2.8/main/streams/cast.c @@ -18,7 +18,6 @@ /* $Id$ */ @@ -69,8 +69,8 @@ #include "php.h" #include "php_globals.h" #include "php_network.h" ---- php-5.2.6/main/streams/memory.c.gnusrc -+++ php-5.2.6/main/streams/memory.c +--- php-5.2.8/main/streams/memory.c.gnusrc ++++ php-5.2.8/main/streams/memory.c @@ -18,7 +18,6 @@ /* $Id$ */ @@ -79,8 +79,8 @@ #include "php.h" PHPAPI int php_url_decode(char *str, int len); ---- php-5.2.6/main/streams/streams.c.gnusrc -+++ php-5.2.6/main/streams/streams.c +--- php-5.2.8/main/streams/streams.c.gnusrc ++++ php-5.2.8/main/streams/streams.c @@ -21,7 +21,6 @@ /* $Id$ */ @@ -89,8 +89,8 @@ #include "php.h" #include "php_globals.h" #include "php_network.h" ---- php-5.2.6/Zend/zend_language_parser.c.gnusrc -+++ php-5.2.6/Zend/zend_language_parser.c +--- php-5.2.8/Zend/zend_language_parser.c.gnusrc ++++ php-5.2.8/Zend/zend_language_parser.c @@ -356,6 +356,8 @@ #include "zend_API.h" #include "zend_constants.h" diff --git a/php-4.3.3-install.patch b/php-5.2.8-install.patch similarity index 56% rename from php-4.3.3-install.patch rename to php-5.2.8-install.patch index 93115cf..ad615c4 100644 --- a/php-4.3.3-install.patch +++ b/php-5.2.8-install.patch @@ -1,6 +1,6 @@ ---- php-4.3.3/sapi/apache2handler/config.m4.install -+++ php-4.3.3/sapi/apache2handler/config.m4 -@@ -59,7 +59,7 @@ +--- php-5.2.8/sapi/apache2handler/config.m4.install ++++ php-5.2.8/sapi/apache2handler/config.m4 +@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` @@ -8,4 +8,4 @@ + if true; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php4" + -i -n php5" diff --git a/php-5.0.2-phpize64.patch b/php-5.2.8-phpize64.patch similarity index 67% rename from php-5.0.2-phpize64.patch rename to php-5.2.8-phpize64.patch index d81074d..7a14eb5 100644 --- a/php-5.0.2-phpize64.patch +++ b/php-5.2.8-phpize64.patch @@ -1,8 +1,5 @@ - -Install phpize into libdir. - ---- php-5.0.5/scripts/Makefile.frag.phpize64 -+++ php-5.0.5/scripts/Makefile.frag +--- php-5.2.8/scripts/Makefile.frag.phpize64 ++++ php-5.2.8/scripts/Makefile.frag @@ -4,7 +4,7 @@ # @@ -12,8 +9,8 @@ Install phpize into libdir. BUILD_FILES = \ scripts/phpize.m4 \ ---- php-5.0.5/scripts/phpize.in.phpize64 -+++ php-5.0.5/scripts/phpize.in +--- php-5.2.8/scripts/phpize.in.phpize64 ++++ php-5.2.8/scripts/phpize.in @@ -3,7 +3,7 @@ # Variable declaration prefix='@prefix@' @@ -22,4 +19,4 @@ Install phpize into libdir. +phpdir="@libdir@/php/build" includedir="`eval echo @includedir@`/php" builddir="`pwd`" - + SED="@SED@" diff --git a/php.spec b/php.spec index 1448d85..53ad2ce 100644 --- a/php.spec +++ b/php.spec @@ -6,7 +6,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.2.8 -Release: 7%{?dist} +Release: 8%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -16,25 +16,25 @@ Source1: php.conf Source2: php.ini Source3: macros.php -Patch1: php-5.2.6-gnusrc.patch -Patch2: php-4.3.3-install.patch +Patch1: php-5.2.8-gnusrc.patch +Patch2: php-5.2.8-install.patch Patch3: php-5.2.4-norpath.patch -Patch5: php-5.0.2-phpize64.patch -Patch8: php-5.2.0-includedir.patch -Patch9: php-5.2.4-embed.patch +Patch4: php-5.2.8-phpize64.patch +Patch5: php-5.2.0-includedir.patch +Patch6: php-5.2.4-embed.patch # Fixes for extension modules -Patch22: php-4.3.11-shutdown.patch -Patch24: php-5.2.3-macropen.patch +Patch20: php-4.3.11-shutdown.patch +Patch21: php-5.2.3-macropen.patch # Functional changes -Patch30: php-5.0.4-dlopen.patch -Patch31: php-5.2.4-easter.patch -Patch32: php-5.2.6-systzdata.patch +Patch40: php-5.0.4-dlopen.patch +Patch41: php-5.2.4-easter.patch +Patch42: php-5.2.6-systzdata.patch # Fixes for tests -Patch50: php-5.2.7-tests-dashn.patch -Patch51: php-5.0.4-tests-wddx.patch +Patch60: php-5.2.7-tests-dashn.patch +Patch61: php-5.0.4-tests-wddx.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -367,19 +367,19 @@ support for using the pspell library to PHP. %patch1 -p1 -b .gnusrc %patch2 -p1 -b .install %patch3 -p1 -b .norpath -%patch5 -p1 -b .phpize64 -%patch8 -p1 -b .includedir -%patch9 -p1 -b .embed +%patch4 -p1 -b .phpize64 +%patch5 -p1 -b .includedir +%patch6 -p1 -b .embed -%patch22 -p1 -b .shutdown -%patch24 -p1 -b .macropen +%patch20 -p1 -b .shutdown +%patch21 -p1 -b .macropen -%patch30 -p1 -b .dlopen -%patch31 -p1 -b .easter -%patch32 -p1 -b .systzdata +%patch40 -p1 -b .dlopen +%patch41 -p1 -b .easter +%patch42 -p1 -b .systzdata -%patch50 -p1 -b .tests-dashn -%patch51 -p1 -b .tests-wddx +%patch60 -p1 -b .tests-dashn +%patch61 -p1 -b .tests-wddx # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -738,6 +738,9 @@ rm files.* macros.php %files process -f files.process %changelog +* Wed Feb 4 2009 Joe Orton 5.2.8-8 +- fix patch fuzz, renumber patches + * Wed Feb 4 2009 Joe Orton 5.2.8-7 - drop obsolete configure args - drop -odbc patch (#483690)