From 989e32ff2ae1c3725519ab5d6118d0cc6eda9a11 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jan 2020 14:09:39 +0100 Subject: v2.0.7 --- PHPINFO | 2 +- REFLECTION | 4 ++-- a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch | 22 ---------------------- php-pecl-yar.spec | 11 +++++------ 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch diff --git a/PHPINFO b/PHPINFO index cbc9527..2d8117f 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ yar yar support => enabled -Version => 2.0.6 +Version => 2.0.7 Directive => Local Value => Master Value yar.packager => msgpack => msgpack diff --git a/REFLECTION b/REFLECTION index f743d7e..8c09572 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #108 yar version 2.0.6 ] { +Extension [ extension #108 yar version 2.0.7 ] { - Dependencies { Dependency [ json (Required) ] @@ -33,7 +33,7 @@ Extension [ extension #108 yar version 2.0.6 ] { } - Constants [19] { - Constant [ string YAR_VERSION ] { 2.0.6 } + Constant [ string YAR_VERSION ] { 2.0.7 } Constant [ int YAR_OPT_PACKAGER ] { 1 } Constant [ int YAR_OPT_PERSISTENT ] { 2 } Constant [ int YAR_OPT_TIMEOUT ] { 4 } diff --git a/a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch b/a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch deleted file mode 100644 index 91e9b29..0000000 --- a/a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7 Mon Sep 17 00:00:00 2001 -From: Xinchen Hui -Date: Wed, 25 Dec 2019 18:16:26 +0800 -Subject: [PATCH] Attempt to fix test in travis - ---- - tests/yar.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/yar.inc b/tests/yar.inc -index 23d0944..b79e3c1 100644 ---- a/tests/yar.inc -+++ b/tests/yar.inc -@@ -13,7 +13,7 @@ function yar_server_start($doc_root = __DIR__ . "/htdocs", $cmd_args = "-dextens - $php_executable = (getenv('TEST_PHP_EXECUTABLE')?:PHP_BINARY); - $tmp = getenv('TEST_PHP_ARGS'); - if ($tmp) { -- $cmd_args .= $tmp; -+ //$cmd_args .= $tmp; - } - - $descriptorspec = array( diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec index a613226..9cf0801 100644 --- a/php-pecl-yar.spec +++ b/php-pecl-yar.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-yar # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -29,7 +29,7 @@ Summary: Light, concurrent RPC framework Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.0.6 +Version: 2.0.7 %if 0%{?gh_date:1} Release: 0.14.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz @@ -40,8 +40,6 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} -Patch0: https://github.com/laruence/yar/commit/a3be2c6972479ea32fedc4f87b5ebdf3aeccd5f7.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: curl-devel BuildRequires: %{?scl_prefix}php-devel > 7 @@ -116,8 +114,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -R -b .rev - # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then @@ -271,6 +267,9 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR %changelog +* Mon Jan 6 2020 Remi Collet - 2.0.7-1 +- update to 2.0.7 + * Thu Dec 26 2019 Remi Collet - 2.0.6-1 - update to 2.0.6 -- cgit