rpms/php/FC-6 php.spec,1.121,1.122

[fedora-cvs-commits at redhat.com]

Author: jorton

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

Modified Files:
	php.spec 
Log Message:
* Fri Dec 15 2006 Joe Orton <jorton at redhat.com> 5.1.6-3.3.fc6
- fix version for php-zend-abi (Remi Collet, #212804)
- provide php-readline from php-cli



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-6/php.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- php.spec	23 Nov 2006 12:08:41 -0000	1.121
+++ php.spec	15 Dec 2006 15:35:57 -0000	1.122
@@ -1,12 +1,12 @@
 %define contentdir /var/www
 %define apiver 20041225
-%define zendver 220051025
+%define zendver 20050922
 %define pdover 20060409
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.6
-Release: 3.2%{?dist}
+Release: 3.3%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -71,7 +71,7 @@
 Summary: Command-line interface for PHP
 Requires: php-common = %{version}-%{release}
 Provides: php-cgi = %{version}-%{release}
-Provides: php-pcntl
+Provides: php-pcntl, php-readline
 
 %description cli
 The php-cli package contains the command-line interface 
@@ -337,9 +337,9 @@
 fi
 
 # Safety check for Zend API version change.
-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}.
+   : Error: Upstream Zend module ABI version is now ${vzend}, expecting %{zendver}.
    : Update the zendver macro and rebuild.
    exit 1
 fi
@@ -623,6 +623,10 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Dec 15 2006 Joe Orton <jorton at redhat.com> 5.1.6-3.3.fc6
+- fix version for php-zend-abi (Remi Collet, #212804)
+- provide php-readline from php-cli
+
 * Thu Nov 23 2006 Joe Orton <jorton at redhat.com> 5.1.6-3.2.fc6
 - php-xml provides php-domxml (#215656)
 - fix php-pdo-abi provide (#214281)