Accepting request 592077 from devel:tools

- Update to new upstream release 1.10.0

OBS-URL: https://build.opensuse.org/request/show/592077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=7

grpc-build.diff

@@ -7,14 +7,14 @@ Work around it.
  cmake/cares.cmake |    7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
-Index: grpc-1.9.0/cmake/cares.cmake
+Index: grpc-1.10.0/cmake/cares.cmake
 ===================================================================
---- grpc-1.9.0.orig/cmake/cares.cmake
+--- grpc-1.10.0.orig/cmake/cares.cmake
-+++ grpc-1.9.0/cmake/cares.cmake
++++ grpc-1.10.0/cmake/cares.cmake
-@@ -30,10 +30,5 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
+@@ -31,10 +31,5 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo
-     set(gRPC_INSTALL FALSE)
    endif()
  elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package")
+   # Use "CONFIG" as there is no built-in cmake module for c-ares.
 -  find_package(c-ares REQUIRED CONFIG)
 -  if(TARGET c-ares::cares)
 -    set(_gRPC_CARES_LIBRARIES c-ares::cares)

grpc-versioning.diff

@@ -4,98 +4,107 @@ Date: 2017-04-19 10:07:43.563879307 +0200
 Unversioned libraries are an ABI nightmare, so work around that in short order.
 
 ---
- CMakeLists.txt |   11 +++++++++++
+ CMakeLists.txt |   13 +++++++++++++
- 1 file changed, 11 insertions(+)
+ 1 file changed, 13 insertions(+)
 
-Index: grpc-1.9.0/CMakeLists.txt
+Index: grpc-1.10.0/CMakeLists.txt
 ===================================================================
---- grpc-1.9.0.orig/CMakeLists.txt
+--- grpc-1.10.0.orig/CMakeLists.txt
-+++ grpc-1.9.0/CMakeLists.txt
++++ grpc-1.10.0/CMakeLists.txt
-@@ -787,6 +787,7 @@ target_link_libraries(gpr_test_util
+@@ -29,6 +29,8 @@ set(PACKAGE_STRING    "${PACKAGE_NAME} $
+ set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
+ set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
+ project(${PACKAGE_NAME} C CXX)
++# from Makefile:
++set(LIBVER 6)
+ 
+ set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables")
+ set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries")
+@@ -775,6 +777,7 @@ target_link_libraries(gpr_test_util
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gpr
  )
-+set_target_properties(gpr PROPERTIES OUTPUT_NAME "gpr-${PACKAGE_VERSION}")
++set_target_properties(gpr PROPERTIES VERSION ${LIBVER})
  
  
  endif (gRPC_BUILD_TESTS)
-@@ -1044,6 +1045,7 @@ add_library(grpc
+@@ -1032,6 +1035,7 @@ add_library(grpc
    src/core/ext/filters/workarounds/workaround_utils.cc
    src/core/plugin_registry/grpc_plugin_registry.cc
  )
-+set_target_properties(grpc PROPERTIES OUTPUT_NAME "grpc-${PACKAGE_VERSION}")
++set_target_properties(grpc PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc"
-@@ -1355,6 +1357,7 @@ add_library(grpc_cronet
+@@ -1343,6 +1347,7 @@ add_library(grpc_cronet
    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc
    src/core/plugin_registry/grpc_cronet_plugin_registry.cc
  )
-+set_target_properties(grpc_cronet PROPERTIES OUTPUT_NAME "grpc_cronet-${PACKAGE_VERSION}")
++set_target_properties(grpc_cronet PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet"
-@@ -2192,6 +2195,7 @@ add_library(grpc_unsecure
+@@ -2220,6 +2225,7 @@ add_library(grpc_unsecure
    src/core/ext/filters/workarounds/workaround_utils.cc
    src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
  )
-+set_target_properties(grpc_unsecure PROPERTIES OUTPUT_NAME "grpc_unsecure-${PACKAGE_VERSION}")
++set_target_properties(grpc_unsecure PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure"
-@@ -2400,6 +2404,7 @@ add_library(grpc++
+@@ -2429,6 +2435,7 @@ add_library(grpc++
    src/cpp/util/time_cc.cc
    src/cpp/codegen/codegen_init.cc
  )
-+set_target_properties(grpc++ PROPERTIES OUTPUT_NAME "grpc++-${PACKAGE_VERSION}")
++set_target_properties(grpc++ PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++"
-@@ -2880,6 +2885,7 @@ add_library(grpc++_cronet
+@@ -2969,6 +2976,7 @@ add_library(grpc++_cronet
    third_party/nanopb/pb_decode.c
    third_party/nanopb/pb_encode.c
  )
-+set_target_properties(grpc++_cronet PROPERTIES OUTPUT_NAME "grpc++_cronet-${PACKAGE_VERSION}")
++set_target_properties(grpc++_cronet PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet"
-@@ -3076,6 +3082,7 @@ add_library(grpc++_error_details
+@@ -3231,6 +3239,7 @@ add_library(grpc++_error_details
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h
    src/cpp/util/error_details.cc
  )
-+set_target_properties(grpc++_error_details PROPERTIES OUTPUT_NAME "grpc++_error_details-${PACKAGE_VERSION}")
++set_target_properties(grpc++_error_details PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details"
-@@ -3198,6 +3205,7 @@ add_library(grpc++_reflection
+@@ -3355,6 +3364,7 @@ add_library(grpc++_reflection
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h
  )
-+set_target_properties(grpc++_reflection PROPERTIES OUTPUT_NAME "grpc++_reflection-${PACKAGE_VERSION}")
++set_target_properties(grpc++_reflection PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection"
-@@ -3321,6 +3329,7 @@ add_library(grpc++_test_util
+@@ -3479,6 +3489,7 @@ add_library(grpc++_test_util
    test/cpp/util/test_credentials_provider.cc
    src/cpp/codegen/codegen_init.cc
  )
-+set_target_properties(grpc++_unsecure PROPERTIES OUTPUT_NAME "grpc++_unsecure-${PACKAGE_VERSION}")
++set_target_properties(grpc++_unsecure PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util"
-@@ -3916,6 +3925,7 @@ add_library(grpc_plugin_support
+@@ -4206,6 +4217,7 @@ add_library(grpc_plugin_support
    src/compiler/python_generator.cc
    src/compiler/ruby_generator.cc
  )
-+set_target_properties(grpc_plugin_support PROPERTIES OUTPUT_NAME "grpc_plugin_support-${PACKAGE_VERSION}")
++set_target_properties(grpc_plugin_support PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support"
-@@ -4409,6 +4419,7 @@ endif (gRPC_BUILD_TESTS)
+@@ -4700,6 +4712,7 @@ endif (gRPC_BUILD_TESTS)
  add_library(grpc_csharp_ext SHARED
    src/csharp/ext/grpc_csharp_ext.c
  )
-+set_target_properties(grpc_csharp_ext PROPERTIES OUTPUT_NAME "grpc_csharp_ext-${PACKAGE_VERSION}")
++set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${LIBVER})
  
  if(WIN32 AND MSVC)
    set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext"

grpc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 28 14:30:53 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 1.10.0
+  * Several features of core have been removed from the surface
+    or GPR API as they were not used in any wrapped language
+    (except C++) or in external applications.
+  * Changed resolver and LB policy APIs to C++
+  * C++ headers are moved from <grpc++/> to <grpcpp/>.
+
 -------------------------------------------------------------------
 Mon Feb  5 22:36:18 UTC 2018 - jengelh@inai.de
 

grpc.spec

@@ -16,9 +16,9 @@
 #
 
 
-%define lname libgrpc-1_9_0
+%define lname libgrpc6
 Name:           grpc
-Version:        1.9.0
+Version:        1.10.0
 Release:        0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
@@ -88,20 +88,20 @@ b="%buildroot"
 mkdir -p "$b/%_libdir/pkgconfig"
 cp x/opt/pkgconfig/*.pc "$b/%_libdir/pkgconfig/"
 %cmake_install
-for i in "$b/%_libdir"/libg*-%version.so; do
+#for i in "$b/%_libdir"/libg*-%version.so; do
-	ln -s "${i##*/}" "${i%%-%version.so}.so"
+#	ln -s "${i##*/}" "${i%%-%version.so}.so"
-done
+#done
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
 %defattr(-,root,root)
-%_libdir/libg*-%version.so
+%_libdir/libg*.so.6
 
 %files devel
 %defattr(-,root,root)
-%doc LICENSE
+%license LICENSE
 %_bindir/*
 %_includedir/*
 %_libdir/pkgconfig/*.pc

v1.10.0.tar.gz

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

v1.9.0.tar.gz

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