Update to grpc 1.39.1 (close RHBZ#1993554)
Drop unused patch grpc-1.37.0-importlib-abc-python3.10.patch Replace grpc-1.39.0-python-grpcio_tools-use-system-protobuf.patch with a sed expression since it required constant trivial rebasing.
This commit is contained in:
parent
33f1b89bb0
commit
fe0a859b97
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/grpc-1.37.1.tar.gz
|
||||
/googletest-release-1.11.0.tar.gz
|
||||
/grpc-1.39.0.tar.gz
|
||||
/grpc-1.39.1.tar.gz
|
||||
|
@ -1,11 +0,0 @@
|
||||
diff -Naur grpc-1.37.0-original/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py grpc-1.37.0/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
|
||||
--- grpc-1.37.0-original/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py 2021-04-06 18:48:56.000000000 -0400
|
||||
+++ grpc-1.37.0/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py 2021-04-22 15:45:59.234743676 -0400
|
||||
@@ -42,6 +42,7 @@
|
||||
if sys.version_info >= (3, 5, 0):
|
||||
import contextlib
|
||||
import importlib
|
||||
+ import importlib.abc
|
||||
import importlib.machinery
|
||||
import threading
|
||||
|
File diff suppressed because one or more lines are too long
36
grpc.spec
36
grpc.spec
@ -48,7 +48,7 @@
|
||||
%endif
|
||||
|
||||
Name: grpc
|
||||
Version: 1.39.0
|
||||
Version: 1.39.1
|
||||
Release: %autorelease
|
||||
Summary: RPC library and framework
|
||||
|
||||
@ -244,37 +244,33 @@ BuildRequires: dos2unix
|
||||
#
|
||||
# In fact, this may not be needed, since only testing code is patched.
|
||||
Patch0: %{name}-1.39.0-system-crypto-policies.patch
|
||||
# Build python3-grpcio_tools against system protobuf packages instead of
|
||||
# expecting a git submodule. Must also add requisite linker flags using
|
||||
# GRPC_PYTHON_LDFLAGS.
|
||||
Patch1: %{name}-1.39.0-python-grpcio_tools-use-system-protobuf.patch
|
||||
# Add an option GRPC_PYTHON_BUILD_SYSTEM_ABSL to go with the gRPC_ABSL_PROVIDER
|
||||
# option already provided upstream. See
|
||||
# https://github.com/grpc/grpc/issues/25559.
|
||||
Patch2: %{name}-1.37.0-python-grpcio-use-system-abseil.patch
|
||||
Patch1: %{name}-1.37.0-python-grpcio-use-system-abseil.patch
|
||||
# Fix errors like:
|
||||
# TypeError: super(type, obj): obj must be an instance or subtype of type
|
||||
# It is not clear why these occur.
|
||||
Patch3: %{name}-1.36.4-python-grpcio_tests-fixture-super.patch
|
||||
Patch2: %{name}-1.36.4-python-grpcio_tests-fixture-super.patch
|
||||
# Skip tests requiring non-loopback network access when the
|
||||
# FEDORA_NO_NETWORK_TESTS environment variable is set.
|
||||
Patch4: %{name}-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch
|
||||
Patch3: %{name}-1.36.4-python-grpcio_tests-make-network-tests-skippable.patch
|
||||
# A handful of compression tests miss the compression ratio threshold. It seems
|
||||
# to be inconsistent which particular combinations fail in a particular test
|
||||
# run. It is not clear that this is a real problem. Any help in understanding
|
||||
# the actual cause well enough to fix this or usefully report it upstream is
|
||||
# welcome.
|
||||
Patch5: %{name}-1.36.4-python-grpcio_tests-skip-compression-tests.patch
|
||||
Patch4: %{name}-1.36.4-python-grpcio_tests-skip-compression-tests.patch
|
||||
# The upstream requirement to link gtest/gmock from grpc_cli is spurious.
|
||||
# Remove it. We still have to build the core tests and link a test library
|
||||
# (libgrpc++_test_config.so…)
|
||||
Patch6: %{name}-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
|
||||
Patch5: %{name}-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
|
||||
# Fix confusion about path to python_wrapper.sh in httpcli/httpscli tests. I
|
||||
# suppose that the unpatched code must be correct for how upstream runs the
|
||||
# tests, somehow.
|
||||
Patch7: %{name}-1.39.0-python_wrapper-path.patch
|
||||
Patch6: %{name}-1.39.0-python_wrapper-path.patch
|
||||
# Port Python 2 scripts used in core tests to Python 3
|
||||
Patch8: %{name}-1.39.0-python2-test-scripts.patch
|
||||
Patch7: %{name}-1.39.0-python2-test-scripts.patch
|
||||
|
||||
Requires: %{name}-data = %{version}-%{release}
|
||||
|
||||
@ -580,6 +576,22 @@ Testing utilities for gRPC Python.
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
echo '===== Patching grpcio_tools for system protobuf =====' 2>&1
|
||||
# Build python3-grpcio_tools against system protobuf packages instead of
|
||||
# expecting a git submodule. Must also add requisite linker flags using
|
||||
# GRPC_PYTHON_LDFLAGS. This was formerly done by
|
||||
# grpc-VERSION-python-grpcio_tools-use-system-protobuf.patch, but it had to be
|
||||
# tediously but trivially rebased every patch release as the CC_FILES list
|
||||
# changed, so we automated the patch.
|
||||
sed -r -i \
|
||||
-e "s/^(# AUTO-GENERATED .*)/\\1\\n\
|
||||
# Then, modified by hand to build with an external system protobuf\
|
||||
# installation./" \
|
||||
-e 's/^(CC_FILES=\[).*(\])/\1\2/' \
|
||||
-e "s@^((CC|PROTO)_INCLUDE=')[^']+'@\1%{_includedir}'@" \
|
||||
-e '/^PROTOBUF_SUBMODULE_VERSION=/d' \
|
||||
'tools/distrib/python/grpcio_tools/protoc_lib_deps.py'
|
||||
|
||||
echo '===== Preparing gtest/gmock =====' 2>&1
|
||||
%if %{without system_gtest}
|
||||
# Copy in the needed gtest/gmock implementations.
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (grpc-1.39.0.tar.gz) = bf1095d03eb1eb8a803730702edd43a4d4a448f3f1370aff8688f8ea8fc3a8f29bb8399e6356a9a347c775129960632e0e3b883a3b82f4af41022786ff40df00
|
||||
SHA512 (googletest-release-1.11.0.tar.gz) = 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
|
||||
SHA512 (grpc-1.39.1.tar.gz) = 37a2e8d82a8920bbd04c03f31ec6ff506b30bd5fb7aaf4febc42633dab7429eefe0c313d2b56a962ff8be3f463f98417a474ba6ab5e99ab7ca8768e693c6bc1d
|
||||
|
Loading…
Reference in New Issue
Block a user