rpms/php/devel php-5.2.0-filterm4.patch, NONE, 1.1 php.spec, 1.129, 1.130

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9098

Modified Files:
	php.spec 
Added Files:
	php-5.2.0-filterm4.patch 
Log Message:
* Tue Dec  5 2006 Joe Orton <jorton at redhat.com> 5.2.0-8
- fix filter.h installation path
- fix php-zend-abi version (Remi Collet, #212804)


php-5.2.0-filterm4.patch:
 config.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE php-5.2.0-filterm4.patch ---

Using an absolute path to the header means the absolute path gets copied
into $includedir/php.

--- php-5.2.0/ext/filter/config.m4.filterm4
+++ php-5.2.0/ext/filter/config.m4
@@ -91,5 +91,5 @@
   PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared)
   PHP_SUBST(FILTER_SHARED_LIBADD)
 
-  PHP_INSTALL_HEADERS([$ext_srcdir/php_filter.h])
+  PHP_INSTALL_HEADERS([ext/filter/php_filter.h])
 fi


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- php.spec	28 Nov 2006 16:07:22 -0000	1.129
+++ php.spec	5 Dec 2006 15:58:21 -0000	1.130
@@ -1,12 +1,12 @@
 %define contentdir /var/www
 %define apiver 20041225
-%define zendver 220060519
+%define zendver 20060613
 %define pdover 20060511
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.2.0
-Release: 7
+Release: 8
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -22,6 +22,7 @@
 Patch4: php-4.3.2-libtool15.patch
 Patch5: php-5.0.2-phpize64.patch
 Patch6: php-5.1.6-curl716.patch
+Patch7: php-5.2.0-filterm4.patch
 
 # Fixes for extension modules
 Patch21: php-4.3.1-odbc.patch
@@ -295,6 +296,7 @@
 %patch4 -p1 -b .libtool15
 %patch5 -p1 -b .phpize64
 %patch6 -p1 -b .curl716
+%patch7 -p1 -b .filterm4
 
 %patch21 -p1 -b .odbc
 %patch22 -p1 -b .shutdown
@@ -330,7 +332,7 @@
    exit 1
 fi
 
-vzend=`sed -n '/#define ZEND_EXTENSION_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_extensions.h`
+vzend=`sed -n '/#define ZEND_MODULE_API_NO/{s/^[^0-9]*//;p;}' Zend/zend_modules.h`
 if test "x${vzend}" != "x%{zendver}"; then
    : Error: Upstream Zend ABI version is now ${vzend}, expecting %{zendver}.
    : Update the zendver macro and rebuild.
@@ -629,6 +631,10 @@
 %files pdo -f files.pdo
 
 %changelog
+* Tue Dec  5 2006 Joe Orton <jorton at redhat.com> 5.2.0-8
+- fix filter.h installation path
+- fix php-zend-abi version (Remi Collet, #212804)
+
 * Tue Nov 28 2006 Joe Orton <jorton at redhat.com> 5.2.0-7
 - rebuild again