[php] - update to 5.4.10 - remove patches merged upstream

Remi Collet remi at fedoraproject.org
Wed Dec 19 11:13:11 UTC 2012


commit 27d9f1b2faa17ef4b3ca21c26e2ccb36f2bca583
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Dec 19 12:13:04 2012 +0100

    - update to 5.4.10
    - remove patches merged upstream

 .gitignore             |    1 +
 php-5.4.7-imap.patch   |   11 ----------
 php-5.4.7-sqlite.patch |   27 -------------------------
 php-5.4.8-libxml.patch |   50 ------------------------------------------------
 php-5.4.8-mysqli.patch |   11 ----------
 php.spec               |   20 +++++-------------
 sources                |    2 +-
 7 files changed, 8 insertions(+), 114 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2208948..9a352e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ php-5.3*.bz2
 /php-5.4.8.tar.bz2
 /php-5.4.9RC1.tar.bz2
 /php-5.4.9.tar.bz2
+/php-5.4.10.tar.bz2
diff --git a/php.spec b/php.spec
index c9c74fa..478f1fe 100644
--- a/php.spec
+++ b/php.spec
@@ -57,8 +57,8 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.9
-Release: 3%{?dist}
+Version: 5.4.10
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -82,18 +82,10 @@ Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
 Patch8: php-5.4.7-libdb.patch
-# https://bugs.php.net/63361 - Header not installed
-Patch9: php-5.4.8-mysqli.patch
 
 # Fixes for extension modules
-# https://bugs.php.net/63126 - DISABLE_AUTHENTICATOR ignores array
-Patch20: php-5.4.7-imap.patch
 # https://bugs.php.net/63171 no odbc call during timeout
 Patch21: php-5.4.7-odbctimer.patch
-# https://bugs.php.net/63149 check sqlite3_column_table_name
-Patch22: php-5.4.7-sqlite.patch
-# https://bugs.php.net/61557 crash in libxml
-Patch23: php-5.4.8-libxml.patch
 
 # Functional changes
 Patch40: php-5.4.0-dlopen.patch
@@ -664,12 +656,8 @@ support for using the enchant library to PHP.
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
 %patch8 -p1 -b .libdb
-%patch9 -p1 -b .mysqliheaders
 
-%patch20 -p1 -b .imap
 %patch21 -p1 -b .odbctimer
-%patch22 -p1 -b .tablename
-%patch23 -p1 -b .libxmlcrash
 
 %patch40 -p1 -b .dlopen
 %patch41 -p1 -b .easter
@@ -1415,6 +1403,10 @@ fi
 
 
 %changelog
+* Wed Dec 19 2012 Remi Collet <rcollet at redhat.com> 5.4.10-1
+- update to 5.4.10
+- remove patches merged upstream
+
 * Tue Dec 11 2012 Remi Collet <rcollet at redhat.com> 5.4.9-3
 - drop "Configure Command" from phpinfo output
 
diff --git a/sources b/sources
index 7e3983c..fc9d191 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-076a9f84d861d3f664a2878d5773ba78  php-5.4.9.tar.bz2
+cb716b657a30570b9b468b9e7bc551a1  php-5.4.10.tar.bz2


More information about the scm-commits mailing list