From 930c23ab96d6aefd849956c40b30fa504cf5ec6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Aug 2012 08:45:23 +0200 Subject: PHP 5.4.7RC1 --- php-5.4.5-system-libzip.patch | 4 +--- php54.spec | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/php-5.4.5-system-libzip.patch b/php-5.4.5-system-libzip.patch index 092229f..a347a2f 100644 --- a/php-5.4.5-system-libzip.patch +++ b/php-5.4.5-system-libzip.patch @@ -423,9 +423,7 @@ diff -up php-5.4.5RC1/ext/zip/php_zip.c.systzip php-5.4.5RC1/ext/zip/php_zip.c /* TODO: fix _zip_replace */ if (cur_idx >= 0) { if (zip_delete(intern, cur_idx) == -1) { -@@ -2868,7 +3100,11 @@ static PHP_MINFO_FUNCTION(zip) - php_info_print_table_row(2, "Zip", "enabled"); - php_info_print_table_row(2, "Extension Version","$Id$"); +@@ -2870,5 +3098,9 @@ static PHP_MINFO_FUNCTION(zip) php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING); - php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION); +#if defined(HAVE_LIBZIP) diff --git a/php54.spec b/php54.spec index 3b63a65..0fad3e8 100644 --- a/php54.spec +++ b/php54.spec @@ -26,7 +26,7 @@ %global mysql_config %{_libdir}/mysql/mysql_config #global snapdate 201201041830 -#global rcver RC1 +%global rcver RC1 # Optional components; pass "--with mssql" etc to rpmbuild. %global with_oci8 %{?_with_oci8:1}%{!?_with_oci8:0} @@ -66,7 +66,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.4.6 +Version: 5.4.7 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else @@ -1440,6 +1440,9 @@ fi %changelog +* Fri Aug 31 2012 Remi Collet 5.4.7-0.1.RC1 +- update to 5.4.7RC1 + * Mon Aug 20 2012 Remi Collet 5.4.6-2 - enable php-fpm on secondary arch (#849490) -- cgit