[packages/php: 20/20] Merge branch 'dev-7.1' into PHP_7_0

[glen]

commit 0ca5ae22bf25a9c7a02565338c9c38624f659d50
Merge: 9f90add 9ca214f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 12 16:25:49 2016 +0200

    Merge branch 'dev-7.1' into PHP_7_0
    
    Conflicts:
            php-ini.patch
            php.spec

 php-fcgi-graceful.patch | 12 ++++++------
 php-fpm-config.patch    |  6 +++---
 php-ini.patch           | 12 ++++++------
 php-systzdata.patch     | 10 ++++------
 php.spec                | 42 ++++++++++++++++++++++++------------------
 spl-shared.patch        | 28 +++++++++++++++-------------
 6 files changed, 58 insertions(+), 52 deletions(-)
---
diff --cc php.spec
index acab650,ad5a498..deddb5e
--- a/php.spec
+++ b/php.spec
@@@ -140,8 -133,9 +140,8 @@@
  %undefine	with_filter
  %endif
  
 -%define		rel		0.5
  %define		orgname	php
- %define		ver_suffix 70
+ %define		ver_suffix 71
  %define		php_suffix %{!?with_default_php:%{ver_suffix}}
  Summary:	PHP: Hypertext Preprocessor
  Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
@@@ -150,8 -144,8 +150,8 @@@ Summary(pt_BR.UTF-8):	A linguagem de sc
  Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
  Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
  Name:		%{orgname}%{php_suffix}
- Version:	7.0.13
- Release:	1
+ Version:	7.1.0
 -Release:	1.1
++Release:	2
  Epoch:		4
  # All files licensed under PHP version 3.01, except
  # Zend is licensed under Zend
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/0ca5ae22bf25a9c7a02565338c9c38624f659d50