diff options
| -rw-r--r-- | php-intl.patch | 20 | ||||
| -rw-r--r-- | php55.spec | 10 |
2 files changed, 6 insertions, 24 deletions
diff --git a/php-intl.patch b/php-intl.patch deleted file mode 100644 index 182e2ef..0000000 --- a/php-intl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- php-5.5.14/ext/intl/locale/locale_methods.c 2014-06-25 15:06:23.000000000 +0200 -+++ php-5.5.15RC1/ext/intl/locale/locale_methods.c 2014-07-08 23:55:31.000000000 +0200 -@@ -279,7 +279,7 @@ - if( fromParseLocale==1 ){ - /* Handle singletons */ - if( strcmp(tag_name , LOC_LANG_TAG)==0 ){ -- if( strlen(loc_name)>1 && isIDPrefix(loc_name) ){ -+ if( strlen(loc_name)>1 && (isIDPrefix(loc_name) == 1) ){ - return estrdup(loc_name); - } - } -@@ -506,7 +506,7 @@ - } - - if(loc_name_len == 0) { -- loc_name = INTL_G(default_locale); -+ loc_name = intl_locale_get_default(TSRMLS_C); - } - - if( strcmp(tag_name, DISP_NAME) != 0 ){ @@ -125,11 +125,11 @@ Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.5.14 +Version: 5.5.15 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -190,7 +190,6 @@ Patch47: php-5.4.9-phpinfo.patch Patch91: php-5.3.7-oci8conf.patch # Upstream fixes (100+) -Patch100: php-intl.patch # Security fixes (200+) @@ -924,7 +923,6 @@ rm -rf ext/json %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .intl # security patches @@ -1929,6 +1927,10 @@ fi %changelog +* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> 5.5.15-1 +- Update to 5.5.15 + http://www.php.net/releases/5_5_15.php + * Wed Jul 16 2014 Remi Collet <remi@fedoraproject.org> 5.5.14-2 - add upstream patch for #67605 |