rpms/php/devel php-4.3.9-metaphone.patch, NONE, 1.1 php.spec, 1.149, 1.150

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24526

Modified Files:
	php.spec 
Added Files:
	php-4.3.9-metaphone.patch 
Log Message:
* Mon Oct 15 2007 Joe Orton <jorton at redhat.com> 5.2.4-3
- correct pcre BR version (#333021)
- restore metaphone fix (#205714)
- add READMEs to php-cli


php-4.3.9-metaphone.patch:

--- NEW FILE php-4.3.9-metaphone.patch ---

https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=135828

--- php-4.3.9/ext/standard/metaphone.c.metaphone
+++ php-4.3.9/ext/standard/metaphone.c
@@ -152,7 +152,7 @@
 						(*phoned_word)[p_idx++] = c; \
 					}
 /* Slap a null character on the end of the phoned word */
-#define End_Phoned_Word	{(*phoned_word)[p_idx] = '\0';}
+#define End_Phoned_Word	Phonize('\0')
 /* How long is the phoned word? */
 #define Phone_Len	(p_idx)
 


Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- php.spec	18 Sep 2007 19:06:36 -0000	1.149
+++ php.spec	16 Oct 2007 12:59:20 -0000	1.150
@@ -6,7 +6,7 @@
 Summary: The PHP HTML-embedded scripting language
 Name: php
 Version: 5.2.4
-Release: 2
+Release: 3
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -28,6 +28,7 @@
 Patch22: php-4.3.11-shutdown.patch
 Patch23: php-5.2.2-pdosym.patch
 Patch24: php-5.2.3-macropen.patch
+Patch25: php-4.3.9-metaphone.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
@@ -43,7 +44,7 @@
 BuildRequires: gmp-devel, aspell-devel >= 0.50.0
 BuildRequires: httpd-devel >= 2.0.46-1, libjpeg-devel, libpng-devel, pam-devel
 BuildRequires: libstdc++-devel, openssl-devel, sqlite-devel >= 3.0.0
-BuildRequires: zlib-devel, pcre-devel >= 4.5, smtpdaemon, readline-devel
+BuildRequires: zlib-devel, pcre-devel >= 6.6, smtpdaemon, readline-devel
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 Obsoletes: php-dbg, php3, phpfi, stronghold-php
 # Enforce Apache module ABI compatibility
@@ -357,6 +358,7 @@
 %patch22 -p1 -b .shutdown
 %patch23 -p1 -b .pdosym
 %patch24 -p1 -b .macropen
+%patch25 -p1 -b .metaphone
 
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
@@ -680,6 +682,7 @@
 %{_bindir}/php
 %{_bindir}/php-cgi
 %{_mandir}/man1/php.1*
+%doc sapi/cgi/README* sapi/cli/README
 
 %files devel
 %defattr(-,root,root)
@@ -717,6 +720,11 @@
 %files mssql -f files.mssql
 
 %changelog
+* Mon Oct 15 2007 Joe Orton <jorton at redhat.com> 5.2.4-3
+- correct pcre BR version (#333021)
+- restore metaphone fix (#205714)
+- add READMEs to php-cli
+
 * Sun Sep 16 2007 Joe Orton <jorton at redhat.com> 5.2.4-2
 - update to 5.2.4