[packages/php: 26/26] Merge branch 'dev-7.2'

[glen]

commit dd0125116eb779a4bcc5ce73df100a55104adf64
Merge: a2d834a 1e0b2f6
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Oct 28 22:59:39 2017 +0300

    Merge branch 'dev-7.2'
    
    Conflicts:
            php-oracle-instantclient.patch
            php.spec

 fix-test-run.patch             |   4 +-
 libtool-tag.patch              |   4 +-
 mcrypt-libs.patch              |  19 --
 pcre-shared.patch              | 133 +++++++----
 php-include_path.patch         |   4 +-
 php-ini.patch                  |  86 +++----
 php-link-libs.patch            |   4 +-
 php-no_pear_install.patch      |   4 +-
 php-oracle-instantclient.patch |  43 +---
 php-pear.patch                 |   4 +-
 php-shared.patch               |   4 +-
 php-systzdata.patch            | 124 +++++-----
 php.spec                       | 129 +++++------
 spl-shared.patch               |  57 +----
 system-libzip.patch            | 497 -----------------------------------------
 15 files changed, 282 insertions(+), 834 deletions(-)
---
diff --cc php.spec
index f955189,7d757fe..b0328d9
--- a/php.spec
+++ b/php.spec
@@@ -149,8 -153,8 +153,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.1.11
+ Version:	7.2.0
 -Release:	0.23
 +Release:	1
  Epoch:		4
  # All files licensed under PHP version 3.01, except
  # Zend is licensed under Zend
@@@ -624,7 -630,6 +630,7 @@@ Obsoletes:	php54-deve
  Obsoletes:	php55-devel
  Obsoletes:	php56-devel
  Obsoletes:	php70-devel
- Obsoletes:	php72-devel
++Obsoletes:	php71-devel
  
  %description devel
  The php-devel package lets you compile dynamic extensions to PHP.
================================================================

---- gitweb:

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