[packages/grpc] - updated to 1.47.0 (new sonames) - removed obsolete system-absl patch
qboosh
qboosh at pld-linux.org
Tue Jun 28 17:42:45 CEST 2022
commit ed9729ac5f53a050947ed835a0c5d571047bf240
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jun 28 17:44:19 2022 +0200
- updated to 1.47.0 (new sonames)
- removed obsolete system-absl patch
grpc-system-absl.patch | 100 -------------------------------------------------
grpc.spec | 46 ++++++++++++-----------
2 files changed, 24 insertions(+), 122 deletions(-)
---
diff --git a/grpc.spec b/grpc.spec
index 1226411..bbe70d2 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -9,14 +9,13 @@
Summary: RPC library and framework
Summary(pl.UTF-8): Biblioteka i szkielet RPC
Name: grpc
-Version: 1.43.0
-Release: 4
+Version: 1.47.0
+Release: 1
License: Apache v2.0
Group: Libraries
#Source0Download: https://github.com/grpc/grpc/releases
Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 92559743e7b5d3f67486c4c0de2f5cbe
-Patch0: %{name}-system-absl.patch
+# Source0-md5: ba6736177699865450206452a9ae49e0
Patch1: %{name}-sphinx.patch
Patch2: %{name}-x32.patch
Patch3: %{name}-libdir.patch
@@ -25,7 +24,8 @@ URL: https://grpc.io/
BuildRequires: abseil-cpp-devel
BuildRequires: c-ares-devel >= 1.13.0
BuildRequires: cmake >= 3.5.1
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: gcc >= 6:4.7
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: openssl-devel
BuildRequires: protobuf-devel >= 3.12
# with re2Config for cmake
@@ -35,7 +35,7 @@ BuildRequires: rpmbuild(macros) >= 1.714
BuildRequires: zlib-devel
%if %{with python3}
BuildRequires: python3-Cython >= 0.29.8
-BuildRequires: python3-modules >= 1:3.5
+BuildRequires: python3-modules >= 1:3.6
%endif
%if %{with apidocs}
BuildRequires: python3-Sphinx >= 1.8.1
@@ -43,8 +43,9 @@ BuildRequires: python3-six >= 1.10
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# require non-function grpc_core::ExecCtx::exec_ctx_ and grpc_core::ApplicationCallbackExecCtx::callback_exec_ctx_ symbols
-%define skip_post_check_so libgrpc\\+\\+.so.* libgrpc\\+\\+_unsecure.so.*
+# Libs rquire non-function grpc_core::ExecCtx::exec_ctx_ and grpc_core::ApplicationCallbackExecCtx::callback_exec_ctx_ symbols.
+# Wildcard '+' chars to workaround escape incompatibilities between rpm versions.
+%define skip_post_check_so libgrpc...so.* libgrpc.._unsecure.so.*
%description
gRPC is a modern, open source, high-performance remote procedure call
@@ -113,12 +114,13 @@ Dokumentacja API biblioteki Pythona gRPC.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch5 -p1
+%{__rm} doc/.gitignore
+
%build
install -d build
cd build
@@ -171,7 +173,7 @@ export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
install -d $RPM_BUILD_ROOT%{_docdir}
cp -pr doc $RPM_BUILD_ROOT%{_docdir}/%{name}-apidocs-%{version}
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-apidocs-%{version}/{csharp,python/sphinx,.gitignore}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-apidocs-%{version}/python/sphinx
%clean
rm -rf $RPM_BUILD_ROOT
@@ -190,30 +192,30 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/grpc_python_plugin
%attr(755,root,root) %{_bindir}/grpc_ruby_plugin
%attr(755,root,root) %{_libdir}/libgpr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpr.so.21
+%attr(755,root,root) %ghost %{_libdir}/libgpr.so.25
%attr(755,root,root) %{_libdir}/libgrpc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc.so.21
+%attr(755,root,root) %ghost %{_libdir}/libgrpc.so.25
%attr(755,root,root) %{_libdir}/libgrpc_plugin_support.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc_plugin_support.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc_plugin_support.so.1.47
%attr(755,root,root) %{_libdir}/libgrpc_unsecure.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc_unsecure.so.21
+%attr(755,root,root) %ghost %{_libdir}/libgrpc_unsecure.so.25
%attr(755,root,root) %{_libdir}/libgrpc++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc++.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc++.so.1.47
%attr(755,root,root) %{_libdir}/libgrpc++_alts.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc++_alts.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc++_alts.so.1.47
%attr(755,root,root) %{_libdir}/libgrpc++_error_details.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc++_error_details.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc++_error_details.so.1.47
%attr(755,root,root) %{_libdir}/libgrpc++_reflection.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc++_reflection.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc++_reflection.so.1.47
%attr(755,root,root) %{_libdir}/libgrpc++_unsecure.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpc++_unsecure.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpc++_unsecure.so.1.47
%attr(755,root,root) %{_libdir}/libgrpcpp_channelz.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgrpcpp_channelz.so.1.43
+%attr(755,root,root) %ghost %{_libdir}/libgrpcpp_channelz.so.1.47
# TODO: use system libs instead
%attr(755,root,root) %{_libdir}/libaddress_sorting.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaddress_sorting.so.21
+%attr(755,root,root) %ghost %{_libdir}/libaddress_sorting.so.25
%attr(755,root,root) %{_libdir}/libupb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupb.so.21
+%attr(755,root,root) %ghost %{_libdir}/libupb.so.25
%{_datadir}/grpc
%files devel
diff --git a/grpc-system-absl.patch b/grpc-system-absl.patch
deleted file mode 100644
index c197b66..0000000
--- a/grpc-system-absl.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py
---- grpc-1.32.0.org/setup.py 2020-09-08 23:00:06.000000000 +0200
-+++ grpc-1.32.0/setup.py 2021-03-04 23:29:26.600732792 +0100
-@@ -132,6 +132,8 @@ BUILD_WITH_SYSTEM_ZLIB = os.environ.get(
- BUILD_WITH_SYSTEM_CARES = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_CARES',
- 'False')
-
-+BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL', False)
-+
- # Export this variable to use the system installation of re2. You need to
- # have the header files installed (in /usr/include/re2) and during
- # runtime, the shared library must be installed
-@@ -246,6 +248,10 @@ if BUILD_WITH_SYSTEM_CARES:
- CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
- CARES_INCLUDE = (os.path.join('/usr', 'include'),)
-
-+if BUILD_WITH_SYSTEM_ABSL:
-+ CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x, CORE_C_FILES)
-+ ABSL_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- if BUILD_WITH_SYSTEM_RE2:
- CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES)
- RE2_INCLUDE = (os.path.join('/usr', 'include', 're2'),)
-@@ -272,6 +278,12 @@ if BUILD_WITH_SYSTEM_ZLIB:
- EXTENSION_LIBRARIES += ('cares',)
- if BUILD_WITH_SYSTEM_RE2:
- EXTENSION_LIBRARIES += ('re2',)
-+if BUILD_WITH_SYSTEM_ABSL:
-+ EXTENSION_LIBRARIES += ('absl_bad_optional_access', 'absl_bad_variant_access', 'absl_base','absl_city',
-+ 'absl_civil_time', 'absl_cord', 'absl_debugging_internal', 'absl_demangle_internal',
-+ 'absl_exponential_biased', 'absl_graphcycles_internal', 'absl_hash', 'absl_hashtablez_sampler',
-+ 'absl_int128', 'absl_log_severity', 'absl_malloc_internal', 'absl_raw_hash_set',
-+ 'absl_raw_logging_internal', 'absl_spinlock_wait', 'absl_stacktrace', 'absl_status')
-
- DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
- asm_files = []
---- grpc-1.43.0/CMakeLists.txt.orig 2022-02-16 18:44:09.497196632 +0100
-+++ grpc-1.43.0/CMakeLists.txt 2022-02-16 18:47:09.636220735 +0100
-@@ -99,21 +99,11 @@ set(gRPC_ABSL_PROVIDER "module" CACHE ST
- set_property(CACHE gRPC_ABSL_PROVIDER PROPERTY STRINGS "module" "package")
-
- set(gRPC_ABSL_USED_TARGETS
-- absl_algorithm
-- absl_algorithm_container
-- absl_atomic_hook
- absl_bad_optional_access
- absl_bad_variant_access
- absl_base
-- absl_base_internal
-- absl_bind_front
-- absl_bits
- absl_city
- absl_civil_time
-- absl_compressed_tuple
-- absl_config
-- absl_container_common
-- absl_container_memory
- absl_cord
- absl_cord_internal
- absl_cordz_functions
-@@ -122,39 +112,19 @@ set(gRPC_ABSL_USED_TARGETS
- absl_cordz_statistics
- absl_cordz_update_scope
- absl_cordz_update_tracker
-- absl_core_headers
- absl_debugging_internal
- absl_demangle_internal
-- absl_dynamic_annotations
-- absl_endian
-- absl_errno_saver
- absl_exponential_biased
-- absl_fixed_array
-- absl_flat_hash_map
-- absl_function_ref
- absl_graphcycles_internal
- absl_hash
-- absl_hash_function_defaults
-- absl_hash_policy_traits
-- absl_hashtable_debug_hooks
- absl_hashtablez_sampler
-- absl_have_sse
-- absl_inlined_vector
-- absl_inlined_vector_internal
- absl_int128
-- absl_kernel_timeout_internal
-- absl_layout
- absl_log_severity
- absl_low_level_hash
- absl_malloc_internal
-- absl_memory
-- absl_numeric_representation
-- absl_optional
-- absl_raw_hash_map
- absl_raw_hash_set
- absl_raw_logging_internal
- absl_sample_recorder
-- absl_span
- absl_spinlock_wait
- absl_stacktrace
- absl_status
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grpc.git/commitdiff/ed9729ac5f53a050947ed835a0c5d571047bf240
More information about the pld-cvs-commit
mailing list