diff --git a/0001-cxx-Arg-List-Too-Long.patch b/0001-cxx-Arg-List-Too-Long.patch index 0e0d4571c4b17d318707a8bf7fbdaf398d976636..055b770e47a065e701bdfaa5c3175b1d3bc99876 100644 --- a/0001-cxx-Arg-List-Too-Long.patch +++ b/0001-cxx-Arg-List-Too-Long.patch @@ -27,29 +27,29 @@ index e8635eda2d..6ede6e34d2 100644 include/grpcpp/alarm_impl.h \ include/grpcpp/channel.h \ @@ -6267,6 +6277,8 @@ PUBLIC_HEADERS_CXX += \ - include/grpcpp/support/sync_stream_impl.h \ - include/grpcpp/support/time.h \ - include/grpcpp/support/validate_service_config.h \ + include/grpcpp/grpcpp.h \ + include/grpcpp/health_check_service_interface.h \ + include/grpcpp/health_check_service_interface_impl.h \ + +PUBLIC_HEADERS_CXX2 += \ - include/grpc/support/alloc.h \ - include/grpc/support/atm.h \ - include/grpc/support/atm_gcc_atomic.h \ + include/grpcpp/impl/call.h \ + include/grpcpp/impl/channel_argument_option.h \ + include/grpcpp/impl/client_unary_call.h \ @@ -6320,6 +6332,8 @@ PUBLIC_HEADERS_CXX += \ - include/grpc/impl/codegen/propagation_bits.h \ - include/grpc/impl/codegen/slice.h \ - include/grpc/impl/codegen/status.h \ + include/grpcpp/impl/server_initializer.h \ + include/grpcpp/impl/server_initializer_impl.h \ + include/grpcpp/impl/service_type.h \ + +PUBLIC_HEADERS_CXX3 += \ - include/grpc++/impl/codegen/async_stream.h \ - include/grpc++/impl/codegen/async_unary_call.h \ - include/grpc++/impl/codegen/byte_buffer.h \ + include/grpcpp/resource_quota.h \ + include/grpcpp/resource_quota_impl.h \ + include/grpcpp/security/auth_context.h \ @@ -6350,6 +6364,8 @@ PUBLIC_HEADERS_CXX += \ - include/grpc++/impl/codegen/stub_options.h \ - include/grpc++/impl/codegen/sync_stream.h \ - include/grpc++/impl/codegen/time.h \ + include/grpcpp/server_impl.h \ + include/grpcpp/server_posix.h \ + include/grpcpp/server_posix_impl.h \ + +PUBLIC_HEADERS_CXX4 += \ - include/grpcpp/impl/codegen/async_generic_service.h \ - include/grpcpp/impl/codegen/async_stream.h \ - include/grpcpp/impl/codegen/async_stream_impl.h \ + include/grpcpp/support/async_stream.h \ + include/grpcpp/support/async_stream_impl.h \ + include/grpcpp/support/async_unary_call.h \ diff --git a/grpc-1.28.1.tar.gz b/grpc-1.30.2.tar.gz similarity index 47% rename from grpc-1.28.1.tar.gz rename to grpc-1.30.2.tar.gz index 2266421918507d9afca37f50ad5436ce51d08526..d5df464fad5db3a909a95dce1bd7fb9e58b9a8ca 100644 Binary files a/grpc-1.28.1.tar.gz and b/grpc-1.30.2.tar.gz differ diff --git a/grpc.spec b/grpc.spec index 2af482e21f09788037170224c52dea2c01019500..ee15339e54c972456b8ee7452993cea187331c75 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,18 +1,20 @@ Name: grpc -Version: 1.28.1 +Version: 1.30.2 Release: 1 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz Source1: abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz +Source2: v1.5.1.tar.gz -Patch9000: 0001-cxx-Arg-List-Too-Long.patch -Patch9001: 0002-add-secure-compile-option-in-Makefile.patch +Patch0001: 0001-cxx-Arg-List-Too-Long.patch +Patch0002: 0002-add-secure-compile-option-in-Makefile.patch BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler gdb BuildRequires: openssl-devel c-ares-devel gflags-devel gtest-devel zlib-devel gperftools-devel BuildRequires: python3-devel python3-setuptools python3-Cython +BuildRequires: grpc Requires: protobuf-compiler Provides: %{name}-plugins = %{version}-%{release} @@ -42,11 +44,12 @@ Requires: %{name} = %{version}-%{release} Python3 bindings for gRPC. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{version} sed -i 's:^prefix ?= .*:prefix ?= %{_prefix}:' Makefile sed -i 's:$(prefix)/lib:$(prefix)/%{_lib}:' Makefile sed -i 's:^GTEST_LIB =.*::' Makefile tar -zxf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/abseil-cpp/ +tar -zxf %{SOURCE2} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/benchmark/ %build %make_build shared plugins @@ -62,6 +65,9 @@ export CFLAGS="%optflags" %install make install prefix="%{buildroot}%{_prefix}" make install-grpc-cli prefix="%{buildroot}%{_prefix}" + +cp -a %{_libdir}/lib{address_sorting,gpr,grpc,grpc_cronet,grpc_unsecure,upb}.so.9* %{buildroot}%{_libdir} + %delete_la_and_a %py3_install @@ -93,6 +99,12 @@ make install-grpc-cli prefix="%{buildroot}%{_prefix}" %{python3_sitearch}/grpcio-%{version}-py?.?.egg-info %changelog +* Fri Jul 31 2020 gaihuiying - 1.30.2-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update grpc version to 1.30.2 + * Tue Jun 9 2020 zhujunhao - 1.28.1-1 - upadate to 1.28.1 diff --git a/v1.5.1.tar.gz b/v1.5.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f716263d02258b87d4bccc32d89f0783ab1efc56 Binary files /dev/null and b/v1.5.1.tar.gz differ