#17 DO NOT MERGE: Update to 1.49.0 (bootstrap) (close RHBZ#2126980)
Closed 9 months ago by music. Opened 2 years ago by music.
rpms/ music/grpc v1.49  into  rawhide

file modified
+2
@@ -36,3 +36,5 @@ 

  /grpc-1.48.0.tar.gz

  /data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz

  /grpc-1.48.1.tar.gz

+ /data-plane-api-bf6154e482bbd5e6f64032993206e66b6116f2bd.tar.gz

+ /grpc-1.49.0.tar.gz

grpc-1.49.0-grpc_cli-do-not-link-gtest-gmock.patch grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch
file renamed
+10 -10
@@ -1,7 +1,7 @@ 

- diff -Naur grpc-1.37.1-original/CMakeLists.txt grpc-1.37.1/CMakeLists.txt

- --- grpc-1.37.1-original/CMakeLists.txt	2021-04-27 18:01:25.000000000 -0400

- +++ grpc-1.37.1/CMakeLists.txt	2021-05-04 11:00:04.934427672 -0400

- @@ -3294,10 +3294,6 @@

+ diff -Naur grpc-1.49.0-original/CMakeLists.txt grpc-1.49.0/CMakeLists.txt

+ --- grpc-1.49.0-original/CMakeLists.txt	2022-09-13 21:34:30.000000000 -0400

+ +++ grpc-1.49.0/CMakeLists.txt	2022-09-16 22:38:53.295396777 -0400

+ @@ -3738,10 +3738,6 @@

       ${_gRPC_UPB_INCLUDE_DIR}

       ${_gRPC_XXHASH_INCLUDE_DIR}

       ${_gRPC_ZLIB_INCLUDE_DIR}
@@ -12,7 +12,7 @@ 

       ${_gRPC_PROTO_GENS_DIR}

   )

   target_link_libraries(grpc++_test_config

- @@ -10669,7 +10665,6 @@

+ @@ -10777,7 +10773,6 @@

   

   

   endif()
@@ -20,7 +20,7 @@ 

   

   add_executable(grpc_cli

     ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc

- @@ -10683,8 +10678,6 @@

+ @@ -10791,8 +10786,6 @@

     test/cpp/util/proto_file_parser.cc

     test/cpp/util/proto_reflection_descriptor_database.cc

     test/cpp/util/service_describer.cc
@@ -29,7 +29,7 @@ 

   )

   

   target_include_directories(grpc_cli

- @@ -10699,10 +10692,6 @@

+ @@ -10807,10 +10800,6 @@

       ${_gRPC_UPB_INCLUDE_DIR}

       ${_gRPC_XXHASH_INCLUDE_DIR}

       ${_gRPC_ZLIB_INCLUDE_DIR}
@@ -40,11 +40,11 @@ 

       ${_gRPC_PROTO_GENS_DIR}

   )

   

- @@ -10715,7 +10704,6 @@

+ @@ -10823,7 +10812,6 @@

   )

   

   

  -endif()

-  if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_CPP_PLUGIN)

+  if(gRPC_BUILD_TESTS)

   

-  add_executable(grpc_cpp_plugin

+  add_executable(grpc_completion_queue_test

file modified
+10 -9
@@ -44,7 +44,7 @@ 

  # it is unlikely to every be successfully packaged under the Fedora packaging

  # guidelines. Note that the URL is a read-only mirror based on

  # https://github.com/envoyproxy/envoy, with different commit hashes.

- %global envoy_api_commit 9c42588c956220b48eb3099d186487c2f04d32ec

+ %global envoy_api_commit bf6154e482bbd5e6f64032993206e66b6116f2bd

  %global envoy_api_url https://github.com/envoyproxy/data-plane-api

  %global envoy_api_dir data-plane-api-%{envoy_api_commit}

  
@@ -67,7 +67,7 @@ 

  # the proto compilers in this package; the consequence is that we cannot build

  # the python3-grpcio-admin or python3-grpcio-csds subpackages until after

  # bootstrapping.

- %bcond_with bootstrap

+ %bcond_without bootstrap

  

  # This must be enabled to get grpc_cli, which is apparently considered part of

  # the tests by upstream. This is mentioned in
@@ -123,19 +123,19 @@ 

  # documentation. Instead, we have just dropped all documentation.

  

  Name:           grpc

- Version:        1.48.1

+ Version:        1.49.0

  Release:        %autorelease

  Summary:        RPC library and framework

  

- %global srcversion %(echo '%{version}' | sed -r 's/~rc/-pre/')

+ %global srcversion %(echo '%{version}' | sed -r 's/~/-/')

  %global pyversion %(echo '%{version}' | tr -d '~')

  

  # CMakeLists.txt: gRPC_CORE_SOVERSION

- %global c_so_version 26

+ %global c_so_version 27

  # CMakeLists.txt: gRPC_CPP_SOVERSION

  # See https://github.com/abseil/abseil-cpp/issues/950#issuecomment-843169602

  # regarding unusual C++ SOVERSION style (not a single number).

- %global cpp_so_version 1.48

+ %global cpp_so_version 1.49

  

  # The entire source is Apache-2.0 except the following:

  #
@@ -272,7 +272,7 @@ 

  # grpcio_testing (src/python/grpcio_testing/setup.py) install_requires:

  # grpcio_tests (src/python/grpcio_tests/setup.py) install_requires:

  # grpcio_tools (tools/distrib/python/grpcio_tools/setup.py) install_requires:

- BuildRequires:  python3dist(protobuf) >= 3.12.0

+ BuildRequires:  python3dist(protobuf) >= 4.21.3

  

  # grpcio_status (src/python/grpcio_status/setup.py) install_requires:

  BuildRequires:  python3dist(googleapis-common-protos) >= 1.5.5
@@ -341,8 +341,9 @@ 

  Patch:          grpc-1.48.0-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…)

- Patch:          grpc-1.37.0-grpc_cli-do-not-link-gtest-gmock.patch

+ # (libgrpc++_test_config.so…). This could probably be fixed upstream, but not

+ # by patching CMakeLists.txt as we are doing, since it is generated.

+ Patch:          grpc-1.49.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.

file modified
+2 -2
@@ -1,6 +1,6 @@ 

- SHA512 (grpc-1.48.1.tar.gz) = 593bff5b264023733d3bd5050a8b8d4e4258ea84b27bca31f271e139da24a2af5bb261e187208606b91227c8b602a329c66fb3c13bc05b0ad31cd9c48face948

+ SHA512 (grpc-1.49.0.tar.gz) = 592413f0f907ec5c7c6b22366e418c589a653ef105b61bf0f98fc64dc40ccea0d2fadc9af9ade62bffa99cafec6e1305300cb9531202923614fe308b7f831210

  SHA512 (googletest-0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz) = 5c5eaf6ff9f3c1bca025b7ef0234ba97232ba85b43e6354a92f49b7208f5c47581ebaf18bf58618498e5d264f2620c2b6676e81bb0f7df77112b96ba271ececf

- SHA512 (data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz) = 9b1ceff5d018e70b36e02aa1b583f5495b0eb92506055bf6913d2e7ef401d3602cba8723efbc178ee31fdef9aba510fc2284612ebe22a24b5b4a703f07099897

+ SHA512 (data-plane-api-bf6154e482bbd5e6f64032993206e66b6116f2bd.tar.gz) = d7f039d8c875d3e6f260bb936fc50d904e815fa696ebdf675f1b5252ee4a81bf5a1c897be1d56f8960a08f70725d144b73f43b8e2e81a13b274cb330c3ef7b68

  SHA512 (googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz) = cdeefae807df7097174b4bb28c0900b06a68d424c00ebba4ff5add260c9c651351d5e429bfc5de42f95ebb75dadec313f7bd3991c2fa476c9104f9ea656acad4

  SHA512 (opencensus-proto-0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e

  SHA512 (xds-cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz) = eb5878764503872c18b8750b20e2c2e2224e73d9601197752cea7e1e4171899474ad4f39aacc80d6c1b57a50b2161d39f219df64ffb250d045af482dae01ea79

Contains breaking ABI (.so version) and API changes, as usual. Must be announced to devel list with one week’s notice.

Requires https://src.fedoraproject.org/rpms/protobuf/pull-request/25.

Currently work-in-progress and mostly untested.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging src.fedoraproject.org/rpms/grpc for 17,dcd4890

Pull-Request has been closed by music

9 months ago