From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 12 Dec 2016 14:25:49 +0000 (+0200)
Subject: Merge branch 'dev-7.1' into PHP_7_0
X-Git-Tag: auto/th/php71-7.1.0-2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fphp71-7.1.0-2;p=packages%2Fphp.git

Merge branch 'dev-7.1' into PHP_7_0

Conflicts:
	php-ini.patch
	php.spec
---

0ca5ae22bf25a9c7a02565338c9c38624f659d50
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