rpms/php/devel php-5.2.8-gnusrc.patch, NONE, 1.1 php-5.2.8-install.patch, NONE, 1.1 php-5.2.8-phpize64.patch, NONE, 1.1 php.spec, 1.171, 1.172 php-4.3.3-install.patch, 1.1, NONE php-5.0.2-phpize64.patch, 1.2, NONE php-5.2.4-odbc.patch, 1.1, NONE php-5.2.6-gnusrc.patch, 1.1, NONE

Joe Orton jorton at fedoraproject.org
Wed Feb 4 11:40:27 UTC 2009 

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20558

Modified Files:
	php.spec 
Added Files:
	php-5.2.8-gnusrc.patch php-5.2.8-install.patch 
	php-5.2.8-phpize64.patch 
Removed Files:
	php-4.3.3-install.patch php-5.0.2-phpize64.patch 
	php-5.2.4-odbc.patch php-5.2.6-gnusrc.patch 
Log Message:
* Wed Feb  4 2009 Joe Orton <jorton at redhat.com> 5.2.8-8
- fix patch fuzz, renumber patches


php-5.2.8-gnusrc.patch:

--- NEW FILE php-5.2.8-gnusrc.patch ---
--- 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
 
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------
 
--- 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
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
--- 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
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_ini.h"
--- 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
 #ifndef _GNU_SOURCE
-#define _GNU_SOURCE
 #endif
 #include <fnmatch.h>
 #endif
--- 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: zlib_fopen_wrapper.c,v 1.46.2.1.2.5 2007/12/31 07:20:14 sebastian Exp $ */
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #include "php_zlib.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
 
+#include "php_config.h"
 #include "php_version.h"
 #include "zend.h"
 #include "zend_qsort.h"
--- php-5.2.8/main/streams/cast.c.gnusrc
+++ php-5.2.8/main/streams/cast.c
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c,v 1.12.2.1.2.2 2007/12/31 07:20:15 sebastian Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- php-5.2.8/main/streams/memory.c.gnusrc
+++ php-5.2.8/main/streams/memory.c
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c,v 1.8.2.6.2.19 2008/03/15 10:28:53 felipe Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
--- php-5.2.8/main/streams/streams.c.gnusrc
+++ php-5.2.8/main/streams/streams.c
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c,v 1.82.2.6.2.31 2008/11/24 15:37:33 dsp Exp $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
--- 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"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode

php-5.2.8-install.patch:

--- NEW FILE php-5.2.8-install.patch ---
--- 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`
-  if test -z `$APXS -q SYSCONFDIR`; then
+  if true; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -i -n php5"

php-5.2.8-phpize64.patch:

--- NEW FILE php-5.2.8-phpize64.patch ---
--- php-5.2.8/scripts/Makefile.frag.phpize64
+++ php-5.2.8/scripts/Makefile.frag
@@ -4,7 +4,7 @@
 #
 
 phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpbuilddir = $(libdir)/php/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
--- php-5.2.8/scripts/phpize.in.phpize64
+++ php-5.2.8/scripts/phpize.in
@@ -3,7 +3,7 @@
 # Variable declaration
 prefix='@prefix@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
+phpdir="@libdir@/php/build"
 includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- php.spec	4 Feb 2009 11:18:23 -0000	1.171
+++ php.spec	4 Feb 2009 11:39:55 -0000	1.172
@@ -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 @@
 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 @@
 %patch1 -p1 -b .gnusrc
 %patch2 -p1 -b .install
 %patch3 -p1 -b .norpath
-%patch5 -p1 -b .phpize64
-%patch8 -p1 -b .includedir
-%patch9 -p1 -b .embed
-
-%patch22 -p1 -b .shutdown
-%patch24 -p1 -b .macropen
-
-%patch30 -p1 -b .dlopen
-%patch31 -p1 -b .easter
-%patch32 -p1 -b .systzdata
+%patch4 -p1 -b .phpize64
+%patch5 -p1 -b .includedir
+%patch6 -p1 -b .embed
+
+%patch20 -p1 -b .shutdown
+%patch21 -p1 -b .macropen
+
+%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 @@
 %files process -f files.process
 
 %changelog
+* Wed Feb  4 2009 Joe Orton <jorton at redhat.com> 5.2.8-8
+- fix patch fuzz, renumber patches
+
 * Wed Feb  4 2009 Joe Orton <jorton at redhat.com> 5.2.8-7
 - drop obsolete configure args
 - drop -odbc patch (#483690)


--- php-4.3.3-install.patch DELETED ---


--- php-5.0.2-phpize64.patch DELETED ---


--- php-5.2.4-odbc.patch DELETED ---


--- php-5.2.6-gnusrc.patch DELETED ---

More information about the scm-commits mailing list