From 192e86cbe356320e3d89e5b431e3723eedaebadb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 6 May 2017 11:06:53 +0200 Subject: v1.3.1RC1 --- REFLECTION | 2 +- package.xml | 480 ++++++++++++++++++++++++++++------------------------- php-pecl-grpc.spec | 21 ++- 3 files changed, 265 insertions(+), 238 deletions(-) diff --git a/REFLECTION b/REFLECTION index 01f8e11..42fdc01 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #92 grpc version 1.2.0 ] { +Extension [ extension #92 grpc version 1.3.1RC1 ] { - Constants [41] { Constant [ integer Grpc\CALL_OK ] { 0 } diff --git a/package.xml b/package.xml index 4ad54c4..c970630 100644 --- a/package.xml +++ b/package.xml @@ -10,25 +10,24 @@ grpc-packages@google.com yes - 2017-03-20 - + 2017-05-04 + - 1.2.0 - 1.2.0 + 1.3.1RC1 + 1.3.1RC1 - stable - stable + beta + beta BSD -- Added arg info macros #9751 -- Updated codegen to be consistent with protobuf #9492 +- gRPC Core 1.3 uptake - - + + @@ -52,7 +51,7 @@ - + @@ -67,30 +66,30 @@ - + - + - - - - + + + + - - + + @@ -103,14 +102,16 @@ - + + + - + @@ -132,13 +133,13 @@ - + - + @@ -146,11 +147,11 @@ - + - + @@ -161,30 +162,30 @@ - + + - - - - + + + + - - + - - + + - + @@ -197,15 +198,15 @@ - + - - - + + + - + @@ -213,40 +214,43 @@ + - + - + - + + - + - + - + + - + - - + + - + - + @@ -254,6 +258,7 @@ + @@ -261,51 +266,53 @@ - + + - + - + - + - - + + - + - + - + + - - + + - + @@ -318,133 +325,140 @@ - + - - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + - - - - - + + + + + + - - + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + + - - - - - - + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + - - + + - - - + + + @@ -456,9 +470,10 @@ + - - + + @@ -466,131 +481,134 @@ - + - + - + + - + - - - + + + - - + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + + - - + + - + - + - + - + - + - + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - + + + + + + + + + - - + + @@ -598,7 +616,8 @@ - + + @@ -1007,6 +1026,7 @@ + diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec index 6ea9832..3853d12 100644 --- a/php-pecl-grpc.spec +++ b/php-pecl-grpc.spec @@ -11,6 +11,8 @@ %scl_package php-pecl-grpc %endif +## TODO: not suitable for Fedora, tons of bundled libraries + %global pecl_name grpc %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %if "%{php_version}" < "5.6" @@ -18,15 +20,17 @@ %else %global ini_name 40-%{pecl_name}.ini %endif +%global upstream_version 1.3.1 +%global upstream_prever RC1 Summary: General RPC framework Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.0 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz BuildRequires: %{?scl_prefix}php-devel > 5.5 BuildRequires: %{?scl_prefix}php-pear @@ -86,7 +90,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -mv %{pecl_name}-%{version} NTS +mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -95,13 +99,13 @@ sed -e 's/role="test"/role="src"/' \ cd NTS # https://github.com/grpc/grpc/issues/10842 -sed -e '/Replace with version number/s/0.1.0/%{version}/' \ +sed -e '/Replace with version number/s/0.1.0/%{upstream_version}%{?upstream_prever}/' \ -i src/php/ext/grpc/php_grpc.h # Sanity check, really often broken extver=$(sed -n '/Replace/{s/.* "//;s/".*$//;p}' src/php/ext/grpc/php_grpc.h) -if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then + : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 fi cd .. @@ -216,7 +220,10 @@ cd ../ZTS %changelog -* Thu Dec 1 2016 Remi Collet - 1.2.0-1 +* Sat May 6 2017 Remi Collet - 1.3.1~RC1-1 +- update to 1.3.1RC1 + +* Tue Apr 25 2017 Remi Collet - 1.2.0-1 - initial package, version 1.2.0 (stable) - open https://github.com/grpc/grpc/issues/10842 bad version - open https://github.com/grpc/grpc/issues/10843 build fail with gcc 7 -- cgit