diff --git a/grpc-versioning.diff b/grpc-versioning.diff index 9e6e087..670f48d 100644 --- a/grpc-versioning.diff +++ b/grpc-versioning.diff @@ -4,46 +4,46 @@ Date: 2017-04-19 10:07:43.563879307 +0200 Unversioned libraries are an ABI nightmare, so work around that in short order. --- - CMakeLists.txt | 10 ++++++++++ - 1 file changed, 10 insertions(+) + CMakeLists.txt | 11 +++++++++++ + 1 file changed, 11 insertions(+) -Index: grpc-1.7.3/CMakeLists.txt +Index: grpc-1.8.2/CMakeLists.txt =================================================================== ---- grpc-1.7.3.orig/CMakeLists.txt -+++ grpc-1.7.3/CMakeLists.txt +--- grpc-1.8.2.orig/CMakeLists.txt ++++ grpc-1.8.2/CMakeLists.txt @@ -825,6 +825,7 @@ add_library(gpr - src/core/lib/support/tmpfile_windows.c - src/core/lib/support/wrap_memcpy.c + src/core/lib/support/tmpfile_windows.cc + src/core/lib/support/wrap_memcpy.cc ) +set_target_properties(gpr PROPERTIES OUTPUT_NAME "gpr-${PACKAGE_VERSION}") if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1217,6 +1218,7 @@ add_library(grpc - src/core/ext/filters/workarounds/workaround_utils.c - src/core/plugin_registry/grpc_plugin_registry.c +@@ -1205,6 +1206,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}") if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1530,6 +1532,7 @@ add_library(grpc_cronet - src/core/ext/filters/load_reporting/server_load_reporting_plugin.c - src/core/plugin_registry/grpc_cronet_plugin_registry.c +@@ -1519,6 +1521,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}") if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2380,6 +2383,7 @@ add_library(grpc_unsecure - src/core/ext/filters/workarounds/workaround_utils.c - src/core/plugin_registry/grpc_unsecure_plugin_registry.c +@@ -2361,6 +2364,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}") if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2595,6 +2599,7 @@ add_library(grpc++ +@@ -2576,6 +2580,7 @@ add_library(grpc++ src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -51,7 +51,7 @@ Index: grpc-1.7.3/CMakeLists.txt if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -3094,6 +3099,7 @@ add_library(grpc++_cronet +@@ -3062,6 +3067,7 @@ add_library(grpc++_cronet third_party/nanopb/pb_decode.c third_party/nanopb/pb_encode.c ) @@ -59,7 +59,15 @@ Index: grpc-1.7.3/CMakeLists.txt if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3420,6 +3426,7 @@ add_library(grpc++_reflection +@@ -3262,6 +3268,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}") + + if(WIN32 AND MSVC) + set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" +@@ -3388,6 +3395,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 ) @@ -67,7 +75,7 @@ Index: grpc-1.7.3/CMakeLists.txt if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -3547,6 +3554,7 @@ add_library(grpc++_test_util +@@ -3515,6 +3523,7 @@ add_library(grpc++_test_util test/cpp/util/test_credentials_provider.cc src/cpp/codegen/codegen_init.cc ) @@ -75,7 +83,7 @@ Index: grpc-1.7.3/CMakeLists.txt if(WIN32 AND MSVC) set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util" -@@ -4156,6 +4164,7 @@ add_library(grpc_plugin_support +@@ -4124,6 +4133,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -83,7 +91,7 @@ Index: grpc-1.7.3/CMakeLists.txt if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4665,6 +4674,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4633,6 +4643,7 @@ endif (gRPC_BUILD_TESTS) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) diff --git a/grpc.changes b/grpc.changes index a3244d6..f17d994 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,7 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 21 12:05:39 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 1.8.2 + * Several LB policies fixes (grpclb and pick_first) + ------------------------------------------------------------------- Mon Dec 11 23:23:19 UTC 2017 - jengelh@inai.de - Update to new upstream release 1.7.3 + * Bugfixes in Load Balancing policies + * Add flow-control and bugfixes to in-process transport + * (C++) Async API extensions to improve multithreading support + and reduce the need for explicit synchronization + * (C++) Unary call API for generic (non-protobuf) RPCs - Drop grpc-zlib.diff, grpc-protobuf.diff (fix included upstream) - Add grpc-build.diff diff --git a/grpc.spec b/grpc.spec index 2196322..1d2306d 100644 --- a/grpc.spec +++ b/grpc.spec @@ -16,9 +16,9 @@ # -%define lname libgrpc-1_7_3 +%define lname libgrpc-1_8_2 Name: grpc -Version: 1.7.3 +Version: 1.8.2 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 @@ -104,11 +104,11 @@ done %doc LICENSE %_bindir/* %_includedir/* -%_libdir/cmake/ %_libdir/pkgconfig/*.pc %_libdir/libgpr.so %_libdir/libgrpc++.so %_libdir/libgrpc++_cronet.so +%_libdir/libgrpc++_error_details.so %_libdir/libgrpc++_reflection.so %_libdir/libgrpc++_unsecure.so %_libdir/libgrpc.so @@ -116,5 +116,6 @@ done %_libdir/libgrpc_csharp_ext.so %_libdir/libgrpc_plugin_support.so %_libdir/libgrpc_unsecure.so +/usr/lib/cmake %changelog diff --git a/v1.7.3.tar.gz b/v1.7.3.tar.gz deleted file mode 100644 index f85611b..0000000 --- a/v1.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e31107f5ee6970525a2b48dd6392613a32d7eeb69c6151cde8f64272c179c866 -size 4728599 diff --git a/v1.8.2.tar.gz b/v1.8.2.tar.gz new file mode 100644 index 0000000..3b9d067 --- /dev/null +++ b/v1.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad58a5004242a865108f60f6348e677a1ffc8f99dd60e35d6a6cb6d809ae0769 +size 4629711