From 046581cc4f58029db9ca67ed279e4c79702b9caf7d0e4fba420bd41e906d6343 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 14 Apr 2023 11:08:49 +0000
Subject: [PATCH] - Update to release 1.54

OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=136
---
 grpc.changes   |  7 +++++++
 grpc.spec      | 45 ++++++++++++++++++++-------------------------
 v1.51.1.tar.gz |  3 ---
 v1.54.0.tar.gz |  3 +++
 4 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 v1.51.1.tar.gz
 create mode 100644 v1.54.0.tar.gz

diff --git a/grpc.changes b/grpc.changes
index 3beac31..1853dcd 100644
--- a/grpc.changes
+++ b/grpc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 14 11:07:33 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.54
+  * XDS: enable XDS federation by default
+  * TlsCreds: Support revocation of intermediate in chain
+
 -------------------------------------------------------------------
 Fri Dec  2 00:11:51 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/grpc.spec b/grpc.spec
index cd5a399..bcaccce 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package grpc
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,11 @@
 #
 
 
-%define lver 29
-%define lverp 1_51
+%define lver 31
+%define lverp 1_54
 %define src_install_dir /usr/src/%name
 Name:           grpc
-Version:        1.51.1
+Version:        1.54.0
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
@@ -55,30 +55,24 @@ The reference implementation of the gRPC protocol, done on top of
 HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
 Protocol Buffers as the Interface Definition Language by default.
 
+%package -n libgrpc%lverp
+Summary:        HTTP/2-based Remote Procedure Call implementation
+Group:          System/Libraries
+
+%description -n libgrpc%lverp
+The reference implementation of the gRPC protocol, done on top of
+HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
+Protocol Buffers as the Interface Definition Language by default.
+
 %package -n libgrpc++%lverp
 Summary:        HTTP/2-based Remote Procedure Call implementation
 Group:          System/Libraries
-%if "%lverp" == "1"
-# prior error in packaging
-Conflicts:      libgrpc6
-%endif
 
 %description -n libgrpc++%lverp
 The reference implementation of the gRPC protocol, done on top of
 HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
 Protocol Buffers as the Interface Definition Language by default.
 
-%package -n libgrpc_plugin_support%lverp
-Summary:        HTTP/2-based Remote Procedure Call implementation - plugin support
-Group:          System/Libraries
-
-%description -n libgrpc_plugin_support%lverp
-The reference implementation of the gRPC protocol, done on top of
-HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
-Protocol Buffers as the Interface Definition Language by default.
-
-This package provides the shared library to support plugins for grpc.
-
 %package -n libupb%lver
 Summary:        A small protobuf implementation in C
 Group:          System/Libraries
@@ -94,8 +88,8 @@ in an arena (note: the arena can live in stack or static memory if desired).
 Summary:        Development files for grpc, a HTTP/2 Remote Procedure Call implementation
 Group:          Development/Tools/Building
 Requires:       libgrpc%lver = %version
+Requires:       libgrpc%lverp = %version
 Requires:       libgrpc++%lverp = %version
-Requires:       libgrpc_plugin_support%lverp = %version
 Requires:       libupb%lver = %version
 Requires:       pkgconfig(libcares)
 Requires:       pkgconfig(re2)
@@ -179,10 +173,10 @@ cp -r * "%buildroot/%src_install_dir"
 
 %post   -n libgrpc%lver -p /sbin/ldconfig
 %postun -n libgrpc%lver -p /sbin/ldconfig
+%post   -n libgrpc%lverp -p /sbin/ldconfig
+%postun -n libgrpc%lverp -p /sbin/ldconfig
 %post   -n libgrpc++%lverp -p /sbin/ldconfig
 %postun -n libgrpc++%lverp -p /sbin/ldconfig
-%post   -n libgrpc_plugin_support%lverp -p /sbin/ldconfig
-%postun -n libgrpc_plugin_support%lverp -p /sbin/ldconfig
 %post   -n libupb%lver -p /sbin/ldconfig
 %postun -n libupb%lver -p /sbin/ldconfig
 
@@ -191,13 +185,14 @@ cp -r * "%buildroot/%src_install_dir"
 %_libdir/libgpr*.so.%{lver}*
 %_libdir/libgrpc*.so.%{lver}*
 
+%files -n libgrpc%lverp
+%_libdir/libgrpc_authorization_provider.so.1.*
+%_libdir/libgrpc_plugin_support.so.1.*
+
 %files -n libgrpc++%lverp
 %_libdir/libgrpc++*.so.*
 %_libdir/libgrpcpp_channelz.so.*
 
-%files -n libgrpc_plugin_support%lverp
-%_libdir/libgrpc_plugin_support.so.1.*
-
 %files -n libupb%lver
 %_libdir/libupb*.so.%{lver}*
 
diff --git a/v1.51.1.tar.gz b/v1.51.1.tar.gz
deleted file mode 100644
index 883f6c6..0000000
--- a/v1.51.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229
-size 8550112
diff --git a/v1.54.0.tar.gz b/v1.54.0.tar.gz
new file mode 100644
index 0000000..431adb6
--- /dev/null
+++ b/v1.54.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e53505a6c84030a26c4fddd71b3f46feec8e0a8eccff2a903b189d349ca6ff5
+size 8900779