Accepting request 725393 from devel:tools

- Update to new upstream release 1.23 [boo#1144068]

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

grpc.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Aug 22 18:28:15 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Disable LTO because it's broken.
+
+-------------------------------------------------------------------
+Sun Aug 18 16:29:43 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 1.23 [boo#1144068]
+  * Fixed a bug where POST_RECV_MESSAGE was not being triggered.
+  * Renamed root certificate bundle in gRPC-C++ pod.
+  * Increased lower bound on DNS re-resolution period to 30 seconds.
+  * Fixed a segfault when forking while using gevent.
+  * Added channel idleness support
+  * Added threadpool support
+
 -------------------------------------------------------------------
 Wed Jun  5 18:52:46 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

grpc.spec

@@ -17,16 +17,16 @@
 
 
 %define lname libgrpc6
-%define src_install_dir /usr/src/%{name}
+%define src_install_dir /usr/src/%name
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           grpc
-Version:        1.21.3
+Version:        1.23
 Release:        0
-%define rver	1.21.3
+%define rver	1.23.0
 Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
 Group:          Development/Tools/Building
-Url:            http://grpc.io/
+URL:            https://grpc.io/
 Source:         https://github.com/grpc/grpc/archive/v%rver.tar.gz
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module devel}
@@ -35,11 +35,11 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python-rpm-macros
+BuildRequires:  zypper
 BuildRequires:  pkgconfig(libcares)
 BuildRequires:  pkgconfig(openssl) >= 1.0.1
 BuildRequires:  pkgconfig(protobuf) >= 3.8.0
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The reference implementation of the gRPC protocol, done on top of
@@ -94,15 +94,19 @@ This subpackage contains the python3 bindings.
 %setup -qn grpc-%rver
 
 %build
-make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 \
+%define _lto_cflags %nil
-	CFLAGS="%optflags -Wno-error" CXXFLAGS="%optflags -Wno-error"
+# protoc is invoked strangely; make it happy with this dir or it will assert()
+mkdir -p third_party/protobuf/src
+
+export CFLAGS="%optflags -Wno-error"
+export CXXFLAGS="$CFLAGS"
+make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1
 
 # build python module
 export GRPC_PYTHON_BUILD_WITH_CYTHON=True
 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=True
-export CFLAGS="%optflags"
 %python_build
 
 %install
@@ -123,13 +127,15 @@ popd
 %python_install
 
 # Install sources
-mkdir -p %{buildroot}%{src_install_dir}
+mkdir -p "%buildroot/%src_install_dir"
-tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir}
+tar -xzf %SOURCE0 --strip-components=1 -C "%buildroot/%src_install_dir"
 # Fix env-script-interpreter rpmlint error
-find %{buildroot}%{src_install_dir} -type f -exec sed -i 's|#!/usr/bin/env bash|#!/bin/bash|' "{}" +
+find "%buildroot/%src_install_dir" -type f \
-find %{buildroot}%{src_install_dir} -type f -exec sed -i 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' "{}" +
+	-exec sed -i 's|#!%_bindir/env bash|#!/bin/bash|' "{}" + \
-find %{buildroot}%{src_install_dir} -type f \( -name "*.bzl" -o -name "*.py" \) -exec sed -i 's|#!/usr/bin/env python2.7|#!/usr/bin/python2.7|' "{}" +
+	-exec sed -i 's|#!%_bindir/env ruby|#!%_bindir/ruby|' "{}" +
-find %{buildroot}%{src_install_dir} -type f \( -name "*.bzl" -o -name "*.py" \) -exec sed -i 's|#!/usr/bin/env python|#!/usr/bin/python|' "{}" +
+find "%buildroot/%src_install_dir" -type f "(" -name "*.bzl" -o -name "*.py" ")" \
+	-exec sed -i 's|#!%_bindir/env python2.7|#!%_bindir/python2.7|' "{}" + \
+	-exec sed -i 's|#!%_bindir/env python|#!%_bindir/python|' "{}" +
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -149,7 +155,7 @@ find %{buildroot}%{src_install_dir} -type f \( -name "*.bzl" -o -name "*.py" \)
 %_libdir/*.so
 
 %files source
-%{src_install_dir}
+%src_install_dir
 
 %files -n python2-grpcio
 %python2_sitearch/grpc*

v1.21.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50747c8939c535b1059f19534de263eb9b7570b5347390fb24b0bbce8763e9a4
-size 15043356

v1.23.0.tar.gz

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