From 0c81f5808e4ee3f8a2834c6fcbd1c00f99999473 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 11 Nov 2020 08:09:04 +0100
Subject: update to 3.14.0RC2

---
 PHPINFO                |  2 +-
 REFLECTION             |  2 +-
 php-pecl-protobuf.spec | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index ae42f61..9f1917b 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,7 +1,7 @@
 
 protobuf
 
-Version => 3.14.0RC1
+Version => 3.14.0RC2
 
 Directive => Local Value => Master Value
 protobuf.keep_descriptor_pool_after_request => 0 => 0
diff --git a/REFLECTION b/REFLECTION
index ce27444..9eb995e 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 protobuf version 3.14.0RC1 ] {
+Extension [ <persistent> extension #117 protobuf version 3.14.0RC2 ] {
 
   - Dependencies {
     Dependency [ date (Optional) ]
diff --git a/php-pecl-protobuf.spec b/php-pecl-protobuf.spec
index f788043..c20ffdc 100644
--- a/php-pecl-protobuf.spec
+++ b/php-pecl-protobuf.spec
@@ -19,7 +19,7 @@
 %global with_zts    0
 %global ini_name    40-%{pecl_name}.ini
 %global upstream_version 3.14.0
-%global upstream_prever  RC1
+%global upstream_prever  RC2
 
 Summary:       Mechanism for serializing structured data
 Name:          %{?sub_prefix}php-pecl-%{pecl_name}
@@ -29,8 +29,6 @@ License:       BSD
 URL:           https://pecl.php.net/package/%{pecl_name}
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Source1:       https://raw.githubusercontent.com/protocolbuffers/protobuf/3.14.x/php/ext/google/protobuf/wkt.inc
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
 BuildRequires: %{?scl_prefix}php-pear
@@ -89,9 +87,6 @@ sed -e 's/role="test"/role="src"/' \
 
 
 cd NTS
-cp %{SOURCE1} .
-sed -e 's/"3.13.0"/PHP_PROTOBUF_VERSION/' -i protobuf.c
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PROTOBUF_VERSION/{s/.* "//;s/".*$//;p}' protobuf.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -211,6 +206,9 @@ fi
 
 
 %changelog
+* Wed Nov 11 2020 Remi Collet <remi@remirepo.net> - 3.14.0~RC2-1
+- update to 3.14.0RC2
+
 * Mon Nov  9 2020 Remi Collet <remi@remirepo.net> - 3.14.0~RC1-1
 - update to 3.14.0RC1
 - open https://github.com/protocolbuffers/protobuf/issues/8016
-- 
cgit