From f1ef18b93846238fb691426242fca7076046c989 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 2 May 2023 09:57:55 +0200
Subject: update to 1.55.0RC1

---
 PHPINFO             |  2 +-
 REFLECTION          |  4 ++--
 grpc-build.patch    |  2 +-
 grpc-noatfork.patch |  4 ++--
 php-pecl-grpc.spec  | 13 ++++++++-----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index a9bae57..919f33e 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 grpc
 
 grpc support => enabled
-grpc module version => 1.54.0
+grpc module version => 1.55.0RC1
 
 Directive => Local Value => Master Value
 grpc.enable_fork_support => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index 6bd2d5b..37b79bc 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #122 grpc version 1.54.0 ] {
+Extension [ <persistent> extension #122 grpc version 1.55.0RC1 ] {
 
   - INI {
     Entry [ grpc.enable_fork_support <SYSTEM> ]
@@ -60,7 +60,7 @@ Extension [ <persistent> extension #122 grpc version 1.54.0 ] {
     Constant [ int Grpc\CHANNEL_READY ] { 2 }
     Constant [ int Grpc\CHANNEL_TRANSIENT_FAILURE ] { 3 }
     Constant [ int Grpc\CHANNEL_FATAL_FAILURE ] { 4 }
-    Constant [ string Grpc\VERSION ] { 1.54.0 }
+    Constant [ string Grpc\VERSION ] { 1.55.0RC1 }
   }
 
   - Classes [7] {
diff --git a/grpc-build.patch b/grpc-build.patch
index fca67c4..6674ffe 100644
--- a/grpc-build.patch
+++ b/grpc-build.patch
@@ -1,7 +1,7 @@
 diff -up ./config.m4.rpm ./config.m4
 --- ./config.m4.rpm	2022-07-07 07:28:31.928904255 +0200
 +++ ./config.m4	2022-07-07 07:30:39.835689129 +0200
-@@ -18,8 +18,8 @@ if test "$PHP_GRPC" != "no"; then
+@@ -19,8 +19,8 @@ if test "$PHP_GRPC" != "no"; then
  
    LIBS="-lpthread $LIBS"
  
diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch
index 4422759..a387bf9 100644
--- a/grpc-noatfork.patch
+++ b/grpc-noatfork.patch
@@ -1,11 +1,11 @@
 diff -up ./config.m4.noatfork ./config.m4
 --- ./config.m4.noatfork	2022-07-07 07:30:58.524647576 +0200
 +++ ./config.m4	2022-07-07 07:32:01.490513120 +0200
-@@ -1169,7 +1169,6 @@ if test "$PHP_GRPC" != "no"; then
+@@ -1303,7 +1303,6 @@ if test "$PHP_GRPC" != "no"; then
      , $ext_shared, , -fvisibility=hidden \
      -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
      -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
 -    -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
      -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-     -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.54.0\""')
+     -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.55.0RC1\""')
  
diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec
index 4edf31c..3b46fcd 100644
--- a/php-pecl-grpc.spec
+++ b/php-pecl-grpc.spec
@@ -19,8 +19,8 @@
 %global pecl_name grpc
 %global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name  40-%{pecl_name}.ini
-%global upstream_version 1.54.0
-#global upstream_prever  RC2
+%global upstream_version 1.55.0
+%global upstream_prever  RC1
 
 Summary:        General RPC framework
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
@@ -40,7 +40,7 @@ BuildRequires:  devtoolset-7-toolchain
 %global dtsprefix devtoolset-7-
 %endif
 BuildRequires:  make
-BuildRequires:  %{?dtsprefix}gcc >= 7
+BuildRequires:  %{?dtsprefix}gcc >= 7.0
 BuildRequires:  %{?dtsprefix}gcc-c++
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0
 BuildRequires:  %{?scl_prefix}php-pear
@@ -76,9 +76,9 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .rpm
+%patch -P0 -p1 -b .rpm
 %ifarch %{arm}
-%patch1 -p1 -b .noatfork
+%patch -P1 -p1 -b .noatfork
 %endif
 
 #sed -e '/PHP_GRPC_VERSION/s/RC3/RC2/' -i src/php/ext/grpc/version.h
@@ -208,6 +208,9 @@ cd ../ZTS
 
 
 %changelog
+* Tue May  2 2023 Remi Collet <remi@remirepo.net> - 1.55.0~RC1-1
+- update to 1.55.0RC1
+
 * Tue Apr 18 2023 Remi Collet <remi@remirepo.net> - 1.54.0-1
 - update to 1.54.0
 
-- 
cgit