diff --git a/grpc-build.diff b/grpc-build.diff deleted file mode 100644 index eae9fa3..0000000 --- a/grpc-build.diff +++ /dev/null @@ -1,25 +0,0 @@ -From: Jan Engelhardt -Date: 2017-12-12 00:32:39.501708666 +0100 - -openSUSE's c-ares has no c-aresConfig.cmake or c-ares-config.cmake. -Work around it. ---- - cmake/cares.cmake | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -Index: grpc-1.10.0/cmake/cares.cmake -=================================================================== ---- grpc-1.10.0.orig/cmake/cares.cmake -+++ grpc-1.10.0/cmake/cares.cmake -@@ -31,10 +31,5 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo - 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) -- set(_gRPC_CARES_INCLUDE_DIR ${c-ares_INCLUDE_DIR}) -- endif() -- set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()") -+ set(_gRPC_CARES_LIBRARIES -lcares) - endif() diff --git a/grpc-versioning.diff b/grpc-versioning.diff deleted file mode 100644 index f98c83c..0000000 --- a/grpc-versioning.diff +++ /dev/null @@ -1,125 +0,0 @@ -From: Jan Engelhardt -Date: 2017-04-19 10:07:43.563879307 +0200 - - -The plain Makefile produces these libs: - -/libaddress_sorting.so.6 -> libaddress_sorting.so.6.0.0 -/libgpr.so.6 -> libgpr.so.6.0.0 -/libgrpc++.so.1 -> libgrpc++.so.1.12.0 -/libgrpc++_cronet.so.1 -> libgrpc++_cronet.so.1.12.0 -/libgrpc++_error_details.so.1 -> libgrpc++_error_details.so.1.12.0 -/libgrpc++_reflection.so.1 -> libgrpc++_reflection.so.1.12.0 -/libgrpc++_unsecure.so.1 -> libgrpc++_unsecure.so.1.12.0 -/libgrpc.so.6 -> libgrpc.so.6.0.0 -/libgrpc_cronet.so.6 -> libgrpc_cronet.so.6.0.0 -/libgrpc_unsecure.so.6 -> libgrpc_unsecure.so.6.0.0 - -The cmake files leave them unversioned. - ---- - CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -Index: grpc-1.10.0/CMakeLists.txt -=================================================================== ---- grpc-1.10.0.orig/CMakeLists.txt -+++ grpc-1.10.0/CMakeLists.txt -@@ -29,6 +29,9 @@ 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(XLIBVER 1) - - 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 VERSION ${LIBVER}) - - - endif (gRPC_BUILD_TESTS) -@@ -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 VERSION ${LIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -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 VERSION ${LIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -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 VERSION ${LIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2429,6 +2435,7 @@ add_library(grpc++ - src/cpp/util/time_cc.cc - src/cpp/codegen/codegen_init.cc - ) -+set_target_properties(grpc++ PROPERTIES VERSION ${XLIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -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 VERSION ${XLIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -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 VERSION ${XLIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -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 VERSION ${XLIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -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 VERSION ${XLIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util" -@@ -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 VERSION ${LIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -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 VERSION ${LIBVER}) - - if(WIN32 AND MSVC) - set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" diff --git a/grpc.changes b/grpc.changes index e07b982..d613f50 100644 --- a/grpc.changes +++ b/grpc.changes @@ -2,6 +2,7 @@ Fri May 18 14:55:27 UTC 2018 - jengelh@inai.de - Switch to plain makefiles since they generate more shared libs. +- Remove grpc-build.diff, grpc-versioning.diff. ------------------------------------------------------------------- Fri May 18 13:26:45 UTC 2018 - tbechtold@suse.com diff --git a/grpc.spec b/grpc.spec index fd9691b..cd68740 100644 --- a/grpc.spec +++ b/grpc.spec @@ -25,9 +25,6 @@ License: Apache-2.0 Group: Development/Tools/Building Url: http://grpc.io/ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz -Patch1: grpc-build.diff -Patch2: grpc-versioning.diff - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -62,7 +59,6 @@ applications that want to make use of the gRPC reference implementation. %prep %setup -q -%patch -P 1 -P 2 -p1 %build %make_jobs STRIP=/bin/true V=1 VERBOSE=1 CFLAGS="%optflags" CXXFLAGS="%optflags"