From 046581cc4f58029db9ca67ed279e4c79702b9caf7d0e4fba420bd41e906d6343 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Apr 2023 11:08:49 +0000 Subject: [PATCH 1/4] - 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 + +- 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 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 From c9dc685bd256c0b4d2a6a1d93821618ecd03a66c6847ff3c71daac8cc61c2e24 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Apr 2023 18:32:09 +0000 Subject: [PATCH 2/4] - grpc++.pc: force-add -lgrpc [boo#1210695] OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=137 --- grpc.changes | 5 +++++ grpc.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/grpc.changes b/grpc.changes index 1853dcd..29b7242 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 20 18:31:55 UTC 2023 - Jan Engelhardt + +- grpc++.pc: force-add -lgrpc [boo#1210695] + ------------------------------------------------------------------- Fri Apr 14 11:07:33 UTC 2023 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index bcaccce..5ae8644 100644 --- a/grpc.spec +++ b/grpc.spec @@ -166,6 +166,10 @@ rm -fr third_party/abseil-cpp/* mkdir -p "%buildroot/%src_install_dir" cp -r * "%buildroot/%src_install_dir" +# bugzilla.suse.com/1210695 +# grpc++ headers' inline functions can use functions from the C library, so must be present in .pc +perl -i -lpe 's{-lgrpc\+\+}{-lgrpc++ -lgrpc}' "%buildroot/%_libdir/pkgconfig/grpc++.pc" + %fdupes %buildroot/%_prefix # Checks cannot be run because of `make clean` above From 552ec504bde9a53d3bbf8df305d9f0aa7b14df9128b71c1f5cbb15bf4934c397 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Apr 2023 10:23:42 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:tools package:grpc revision:136 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=138 --- grpc.changes | 5 ----- grpc.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/grpc.changes b/grpc.changes index 29b7242..1853dcd 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Apr 20 18:31:55 UTC 2023 - Jan Engelhardt - -- grpc++.pc: force-add -lgrpc [boo#1210695] - ------------------------------------------------------------------- Fri Apr 14 11:07:33 UTC 2023 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index 5ae8644..bcaccce 100644 --- a/grpc.spec +++ b/grpc.spec @@ -166,10 +166,6 @@ rm -fr third_party/abseil-cpp/* mkdir -p "%buildroot/%src_install_dir" cp -r * "%buildroot/%src_install_dir" -# bugzilla.suse.com/1210695 -# grpc++ headers' inline functions can use functions from the C library, so must be present in .pc -perl -i -lpe 's{-lgrpc\+\+}{-lgrpc++ -lgrpc}' "%buildroot/%_libdir/pkgconfig/grpc++.pc" - %fdupes %buildroot/%_prefix # Checks cannot be run because of `make clean` above From 5dd3b6ea733fa1735923976d7457b72f37a289a3f47e191fcd45f138922fbe0f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 2 May 2023 10:27:27 +0000 Subject: [PATCH 4/4] - Update to release 1.54.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=139 --- grpc.changes | 6 ++++++ grpc.spec | 2 +- v1.54.0.tar.gz | 3 --- v1.54.1.tar.gz | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 v1.54.0.tar.gz create mode 100644 v1.54.1.tar.gz diff --git a/grpc.changes b/grpc.changes index 1853dcd..9e2ac8a 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 2 10:15:43 UTC 2023 - Jan Engelhardt + +- Update to release 1.54.1 + * Bring declarations and definitions to be in sync + ------------------------------------------------------------------- Fri Apr 14 11:07:33 UTC 2023 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index bcaccce..15d7d5e 100644 --- a/grpc.spec +++ b/grpc.spec @@ -20,7 +20,7 @@ %define lverp 1_54 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.54.0 +Version: 1.54.1 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 diff --git a/v1.54.0.tar.gz b/v1.54.0.tar.gz deleted file mode 100644 index 431adb6..0000000 --- a/v1.54.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e53505a6c84030a26c4fddd71b3f46feec8e0a8eccff2a903b189d349ca6ff5 -size 8900779 diff --git a/v1.54.1.tar.gz b/v1.54.1.tar.gz new file mode 100644 index 0000000..c154f6c --- /dev/null +++ b/v1.54.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79e3ff93f7fa3c8433e2165f2550fa14889fce147c15d9828531cbfc7ad11e01 +size 8901937