Accepting request 843413 from home:badshah400:branches:devel:tools

* Update to version 1.33.1.
* Drop grpc-find-re2-via-pkgconfig.patch: incorporated upstream (commit 45e413d).
* Bump so version from 12 to 13 in keeping with upstream.

OBS-URL: https://build.opensuse.org/request/show/843413
OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=70

grpc-correct-pkgconfig-path.patch

@@ -1,8 +1,8 @@
-Index: grpc-1.32.0/CMakeLists.txt
+Index: grpc-1.33.1/CMakeLists.txt
 ===================================================================
---- grpc-1.32.0.orig/CMakeLists.txt
-+++ grpc-1.32.0/CMakeLists.txt
-@@ -15667,7 +15667,7 @@ function(generate_pkgconfig name descrip
+--- grpc-1.33.1.orig/CMakeLists.txt
++++ grpc-1.33.1/CMakeLists.txt
+@@ -15805,7 +15805,7 @@ function(generate_pkgconfig name descrip
      "${output_filepath}"
      @ONLY)
    install(FILES "${output_filepath}"

grpc-find-re2-via-pkgconfig.patch

@@ -1,120 +0,0 @@
-From 45e413d2520795e7281e9a592af81620349bc186 Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@google.com>
-Date: Wed, 9 Sep 2020 04:26:36 -0700
-Subject: [PATCH] Attempt to find RE2 via CMake and via pkg-config.
-
----
- CMakeLists.txt                    |  1 +
- cmake/modules/Findre2.cmake       | 58 +++++++++++++++++++++++++++++++
- cmake/re2.cmake                   |  6 +---
- templates/CMakeLists.txt.template |  1 +
- 4 files changed, 61 insertions(+), 5 deletions(-)
- create mode 100644 cmake/modules/Findre2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4b04d25ac50..cecb4396c57 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15624,6 +15624,7 @@ install(FILES
- )
- install(FILES
-     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/Findc-ares.cmake
-+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/Findre2.cmake
-   DESTINATION ${gRPC_INSTALL_CMAKEDIR}/modules
- )
- 
-diff --git a/cmake/modules/Findre2.cmake b/cmake/modules/Findre2.cmake
-new file mode 100644
-index 00000000000..41df4547138
---- /dev/null
-+++ b/cmake/modules/Findre2.cmake
-@@ -0,0 +1,58 @@
-+# Copyright 2017 gRPC authors.
-+#
-+# Licensed under the Apache License, Version 2.0 (the "License");
-+# you may not use this file except in compliance with the License.
-+# You may obtain a copy of the License at
-+#
-+#     http://www.apache.org/licenses/LICENSE-2.0
-+#
-+# Unless required by applicable law or agreed to in writing, software
-+# distributed under the License is distributed on an "AS IS" BASIS,
-+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+# See the License for the specific language governing permissions and
-+# limitations under the License.
-+
-+find_package(re2 QUIET CONFIG)
-+if(re2_FOUND)
-+  message(STATUS "Found RE2 via CMake.")
-+  return()
-+endif()
-+
-+find_package(PkgConfig REQUIRED)
-+# TODO(junyer): Use the IMPORTED_TARGET option whenever CMake 3.6 (or newer)
-+# becomes the minimum required: that will take care of the add_library() and
-+# set_property() calls; then we can simply alias PkgConfig::RE2 as re2::re2.
-+# For now, we can only set INTERFACE_* properties that existed in CMake 3.5.
-+pkg_check_modules(RE2 QUIET re2)
-+if(RE2_FOUND)
-+  set(re2_FOUND "${RE2_FOUND}")
-+  add_library(re2::re2 INTERFACE IMPORTED)
-+  if(RE2_INCLUDE_DIRS)
-+    set_property(TARGET re2::re2 PROPERTY
-+                 INTERFACE_INCLUDE_DIRECTORIES "${RE2_INCLUDE_DIRS}")
-+  endif()
-+  if(RE2_CFLAGS_OTHER)
-+    # Filter out the -std flag, which is handled by CMAKE_CXX_STANDARD.
-+    # TODO(junyer): Use the FILTER option whenever CMake 3.6 (or newer)
-+    # becomes the minimum required: that will allow this to be concise.
-+    foreach(flag IN LISTS RE2_CFLAGS_OTHER)
-+      if("${flag}" MATCHES "^-std=")
-+        list(REMOVE_ITEM RE2_CFLAGS_OTHER "${flag}")
-+      endif()
-+    endforeach()
-+    set_property(TARGET re2::re2 PROPERTY
-+                 INTERFACE_COMPILE_OPTIONS "${RE2_CFLAGS_OTHER}")
-+  endif()
-+  if(RE2_LDFLAGS)
-+    set_property(TARGET re2::re2 PROPERTY
-+                 INTERFACE_LINK_LIBRARIES "${RE2_LDFLAGS}")
-+  endif()
-+  message(STATUS "Found RE2 via pkg-config.")
-+  return()
-+endif()
-+
-+if(re2_FIND_REQUIRED)
-+  message(FATAL_ERROR "Failed to find RE2.")
-+elseif(NOT re2_FIND_QUIETLY)
-+  message(WARNING "Failed to find RE2.")
-+endif()
-diff --git a/cmake/re2.cmake b/cmake/re2.cmake
-index 3e83aae6910..974b0a436e2 100644
---- a/cmake/re2.cmake
-+++ b/cmake/re2.cmake
-@@ -45,13 +45,9 @@ if(gRPC_RE2_PROVIDER STREQUAL "module")
-     set(gRPC_INSTALL FALSE)
-   endif()
- elseif(gRPC_RE2_PROVIDER STREQUAL "package")
--  find_package(re2 REQUIRED CONFIG)
--
-+  find_package(re2 REQUIRED)
-   if(TARGET re2::re2)
-     set(_gRPC_RE2_LIBRARIES re2::re2)
--  else()
--    set(_gRPC_RE2_LIBRARIES ${RE2_LIBRARIES})
-   endif()
--  set(_gRPC_RE2_INCLUDE_DIR ${RE2_INCLUDE_DIRS})
-   set(_gRPC_FIND_RE2 "if(NOT re2_FOUND)\n  find_package(re2)\nendif()")
- endif()
-diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
-index c7f2556dc92..f7db0fd2d0c 100644
---- a/templates/CMakeLists.txt.template
-+++ b/templates/CMakeLists.txt.template
-@@ -706,6 +706,7 @@
-   )
-   install(FILES
-       <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/cmake/modules/Findc-ares.cmake
-+      <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/cmake/modules/Findre2.cmake
-     DESTINATION <%text>${gRPC_INSTALL_CMAKEDIR}</%text>/modules
-   )
- 

grpc.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Oct 22 11:15:31 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 1.33.1
+  * Core
+    - Deprecate
+      GRPC_ARG_HTTP2_MIN_SENT_PING_INTERVAL_WITHOUT_DATA_MS
+      (gh#grpc/grpc#24063).
+    - Expose Cronet error message to the application layer
+      (gh#grpc/grpc#24083).
+    - Remove grpc_channel_ping from surface API
+      (gh#grpc/grpc#23894).
+    - Do not send BDP pings if there is no receive side activity
+      (gh#grpc/grpc#22997).
+  * C++
+    - Makefile: only support building deps from submodule
+      (gh#grpc/grpc#23957).
+- Drop grpc-find-re2-via-pkgconfig.patch: incorporated upstream
+  (commit 45e413d).
+- Bump so version from 12 to 13 in keeping with upstream.
+
 -------------------------------------------------------------------
 Sun Oct 11 16:14:38 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
 

grpc.spec

@@ -16,12 +16,12 @@
 #
 
 
-%define lver 12
+%define lver 13
 %define lverp 1
 %define lverplugin 1
 %define src_install_dir /usr/src/%name
 Name:           grpc
-Version:        1.32.0
+Version:        1.33.1
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
@@ -29,8 +29,6 @@ Group:          Development/Tools/Building
 URL:            https://grpc.io/
 Source:         https://github.com/grpc/grpc/archive/v%version.tar.gz
 Source2:        %name-rpmlintrc
-# PATCH-FIX-UPSTREAM grpc-find-re2-via-pkgconfig.patch gh#grpc/grpc#24088 badshah400@gmail.com -- Attempt to find Re2 library via pkg-config; patch taken from upstream PR
-Patch0:         grpc-find-re2-via-pkgconfig.patch
 # 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

v1.32.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a
-size 7174251

v1.33.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63
+size 7272703