From dbd64159f40d54175c9437631ce606fcd348da07 Mon Sep 17 00:00:00 2001 From: jorton Date: May 08 2008 12:44:06 +0000 Subject: * Thu May 8 2008 Joe Orton 5.2.6-2 - update to 5.2.6 --- diff --git a/php-4.3.9-metaphone.patch b/php-4.3.9-metaphone.patch deleted file mode 100644 index 7a7a6cf..0000000 --- a/php-4.3.9-metaphone.patch +++ /dev/null @@ -1,14 +0,0 @@ - -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) - diff --git a/php.spec b/php.spec index 0d4eebb..b8cb8c3 100644 --- a/php.spec +++ b/php.spec @@ -5,8 +5,8 @@ Summary: The PHP HTML-embedded scripting language Name: php -Version: 5.2.5 -Release: 4%{?dist} +Version: 5.2.6 +Release: 2%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -27,7 +27,6 @@ Patch9: php-5.2.4-embed.patch Patch21: php-5.2.4-odbc.patch Patch22: php-4.3.11-shutdown.patch Patch24: php-5.2.3-macropen.patch -Patch25: php-4.3.9-metaphone.patch Patch26: php-5.2.5-systzdata.patch # Functional changes @@ -357,7 +356,6 @@ into applications to provide PHP scripting language support. %patch21 -p1 -b .odbc %patch22 -p1 -b .shutdown %patch24 -p1 -b .macropen -%patch25 -p1 -b .metaphone %patch26 -p1 -b .systzdata %patch30 -p1 -b .dlopen @@ -721,6 +719,9 @@ rm files.* macros.php %files mssql -f files.mssql %changelog +* Thu May 8 2008 Joe Orton 5.2.6-2 +- update to 5.2.6 + * Wed Apr 2 2008 Joe Orton 5.2.5-4 - rebuild for new uw-imap diff --git a/sources b/sources index 8e4330e..780cc71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61a0e1661b70760acc77bc4841900b7a php-5.2.5.tar.gz +1720f95f26c506338f0dba3a51906bbd php-5.2.6.tar.gz