From 58c7c8e7040408a2f537e70f9fbdc1b86c1a6c09ad3f4f0570b7ad10ababffa2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Oct 2020 12:32:37 +0000 Subject: [PATCH 1/2] - Use -DgRPC_ABSL_PROVIDER=package (https://github.com/grpc/grpc/issues/24476) OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=72 --- grpc.changes | 6 ++++++ grpc.spec | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/grpc.changes b/grpc.changes index 2cb70fb..6c5fb33 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 27 12:31:44 UTC 2020 - Jan Engelhardt + +- Use -DgRPC_ABSL_PROVIDER=package + (https://github.com/grpc/grpc/issues/24476) + ------------------------------------------------------------------- Thu Oct 22 11:15:31 UTC 2020 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index f78f564..234bbb5 100644 --- a/grpc.spec +++ b/grpc.spec @@ -31,7 +31,7 @@ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz Source2: %name-rpmlintrc # PATCH-FIX-UPSTREAM grpc-correct-pkgconfig-path.patch badshah400@gmail.com -- Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification Patch1: grpc-correct-pkgconfig-path.patch -BuildRequires: abseil-cpp-source +BuildRequires: abseil-cpp-devel BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -129,8 +129,7 @@ This subpackage contains source code of the gRPC reference implementation. %prep %autosetup -p1 -# Copy abseil-cpp source into empty third_party/abseil-cpp dir -cp -r %_prefix/src/abseil-cpp/* third_party/abseil-cpp/ +rm -Rf third_party/abseil-cpp/ %build %define _lto_cflags %nil @@ -141,8 +140,8 @@ export CFLAGS="%optflags -Wno-error" export CXXFLAGS="$CFLAGS" %cmake -DgRPC_INSTALL=ON \ -DgRPC_INSTALL_LIBDIR:PATH="%_lib" \ - -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir"/cmake/grpc \ - -DgRPC_ABSL_PROVIDER=module \ + -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \ + -DgRPC_ABSL_PROVIDER=package \ -DgRPC_CARES_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_RE2_PROVIDER=package \ From 25de9e108085dcad375ebec315d2d2f3fbee97d173b9c9e57a45642af4df1614 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 28 Oct 2020 08:27:01 +0000 Subject: [PATCH 2/2] - Update to release 1.33.2 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=73 --- grpc.changes | 9 +++++++++ grpc.spec | 2 +- v1.33.1.tar.gz | 3 --- v1.33.2.tar.gz | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 v1.33.1.tar.gz create mode 100644 v1.33.2.tar.gz diff --git a/grpc.changes b/grpc.changes index 6c5fb33..d54fadd 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Oct 28 08:17:46 UTC 2020 - Jan Engelhardt + +- Update to release 1.33.2 + * Deprecate GRPC_ARG_HTTP2_MIN_SENT_PING_INTERVAL_WITHOUT_DATA_MS. + * Expose Cronet error message to the application layer. + * Remove grpc_channel_ping from surface API. + * Do not send BDP pings if there is no receive side activity. + ------------------------------------------------------------------- Tue Oct 27 12:31:44 UTC 2020 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index 234bbb5..8b9b181 100644 --- a/grpc.spec +++ b/grpc.spec @@ -21,7 +21,7 @@ %define lverplugin 1 %define src_install_dir /usr/src/%name Name: grpc -Version: 1.33.1 +Version: 1.33.2 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 diff --git a/v1.33.1.tar.gz b/v1.33.1.tar.gz deleted file mode 100644 index 0094248..0000000 --- a/v1.33.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63 -size 7272703 diff --git a/v1.33.2.tar.gz b/v1.33.2.tar.gz new file mode 100644 index 0000000..c0a2176 --- /dev/null +++ b/v1.33.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a +size 7270924