Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rubygem-grpc for openSUSE:Factory checked in at 2024-05-13 17:57:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-grpc (Old) and /work/SRC/openSUSE:Factory/.rubygem-grpc.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-grpc" Mon May 13 17:57:03 2024 rev:7 rq:1173496 version:1.63.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-grpc/rubygem-grpc.changes 2023-11-20 21:18:33.276600928 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-grpc.new.1880/rubygem-grpc.changes 2024-05-13 17:57:12.539986185 +0200 @@ -1,0 +2,17 @@ +Sun May 12 14:07:39 UTC 2024 - Marcus Rueckert <[email protected]> + +- bump grpc-devel to 1.60.0 as we need some newer APIs in the + bindings + +------------------------------------------------------------------- +Sun May 12 12:06:02 UTC 2024 - Marcus Rueckert <[email protected]> + +- New upstream release 1.63.0, no changelog found +- refresh 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch + to apply cleanly again +- use system grpc instead of an intree copy: + - added use_system_libs.patch + - new BuildRequires: grpc-devel +- track series file to make it easier to update patches + +------------------------------------------------------------------- Old: ---- grpc-1.59.2.gem New: ---- grpc-1.63.0.gem series use_system_libs.patch BETA DEBUG BEGIN: New:- use system grpc instead of an intree copy: - added use_system_libs.patch - new BuildRequires: grpc-devel BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-grpc.spec ++++++ --- /var/tmp/diff_new_pack.nZqs1R/_old 2024-05-13 17:57:13.344015521 +0200 +++ /var/tmp/diff_new_pack.nZqs1R/_new 2024-05-13 17:57:13.344015521 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-grpc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,12 +24,14 @@ # Name: rubygem-grpc -Version: 1.59.2 +Version: 1.63.0 Release: 0 %define mod_name grpc %define mod_full_name %{mod_name}-%{version} # MANUAL BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: grpc-devel >= 1.60.0 # /MANUAL BuildRequires: ruby-macros >= 5 BuildRequires: %{rubydevel >= 2.5.0} @@ -37,9 +39,11 @@ Url: https://github.com/google/grpc/tree/master/src/ruby Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: rubygem-grpc.rpmlintrc -Source2: gem2rpm.yml +Source2: series +Source3: gem2rpm.yml # MANUAL Patch0: 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch +Patch1: use_system_libs.patch # /MANUAL Summary: GRPC system in Ruby License: Apache-2.0 @@ -49,7 +53,8 @@ %prep %gem_unpack -%patch0 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 find -type f -print0 | xargs -0 touch -r %{S:0} %gem_build @@ -64,6 +69,8 @@ find %{buildroot}/%{_libdir}/ruby/gems/ \( -name '.sitearchdir.-.grpc.time' -o -name '.yardopts' \) | xargs rm # fix permissions find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ca.pem' -o -name 'server1.key' -o -name 'server1.pem' \) | xargs chmod -x +rm -rf %{buildroot}%{_libdir}/ruby/gems/*/gems/grpc-%{version}/src/ruby/ext/grpc/{libs,objs}/ +rm -rf %{buildroot}%{_libdir}/ruby/gems/*/gems/grpc-%{version}/src/ruby/spec/ # /MANUAL ++++++ 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch ++++++ --- /var/tmp/diff_new_pack.nZqs1R/_old 2024-05-13 17:57:13.368016396 +0200 +++ /var/tmp/diff_new_pack.nZqs1R/_new 2024-05-13 17:57:13.372016542 +0200 @@ -7,11 +7,11 @@ src/ruby/ext/grpc/rb_grpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c -index 30281b5463..53b7e2ed38 100644 ---- a/src/ruby/ext/grpc/rb_grpc.c -+++ b/src/ruby/ext/grpc/rb_grpc.c -@@ -450,9 +450,9 @@ void grpc_rb_fork_unsafe_begin() { g_grpc_rb_num_fork_unsafe_threads++; } +Index: grpc-1.63.0/src/ruby/ext/grpc/rb_grpc.c +=================================================================== +--- grpc-1.63.0.orig/src/ruby/ext/grpc/rb_grpc.c ++++ grpc-1.63.0/src/ruby/ext/grpc/rb_grpc.c +@@ -449,9 +449,9 @@ void grpc_rb_fork_unsafe_begin() { g_grp void grpc_rb_fork_unsafe_end() { g_grpc_rb_num_fork_unsafe_threads--; } // APIs to mark fork-unsafe sections from ruby code @@ -23,7 +23,4 @@ // One-time initialization void Init_grpc_c() { --- -2.42.0 - ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.nZqs1R/_old 2024-05-13 17:57:13.396017418 +0200 +++ /var/tmp/diff_new_pack.nZqs1R/_new 2024-05-13 17:57:13.400017564 +0200 @@ -16,17 +16,21 @@ # :disable_automatic_rdoc_dep: true # ## used by gem2rpm :preamble: |- - BuildRequires: gcc-c++ + BuildRequires: gcc-c++ + BuildRequires: pkgconfig + BuildRequires: grpc-devel >= 1.60.0 # Requires: foobar # ## used by gem2rpm :patches: 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch: -p1 + use_system_libs.patch: -p1 # bar.patch: # :post_patch: # if you need to fiddle with the source dir before rebuilding the gem # ## used by gem2rpm :sources: - rubygem-grpc.rpmlintrc + - series # - foo.desktop # - bar.desktop # :binary_map: @@ -43,6 +47,8 @@ find %{buildroot}/%{_libdir}/ruby/gems/ \( -name '.sitearchdir.-.grpc.time' -o -name '.yardopts' \) | xargs rm # fix permissions find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ca.pem' -o -name 'server1.key' -o -name 'server1.pem' \) | xargs chmod -x + rm -rf %{buildroot}%{_libdir}/ruby/gems/*/gems/grpc-%{version}/src/ruby/ext/grpc/{libs,objs}/ + rm -rf %{buildroot}%{_libdir}/ruby/gems/*/gems/grpc-%{version}/src/ruby/spec/ # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) ++++++ grpc-1.59.2.gem -> grpc-1.63.0.gem ++++++ /work/SRC/openSUSE:Factory/rubygem-grpc/grpc-1.59.2.gem /work/SRC/openSUSE:Factory/.rubygem-grpc.new.1880/grpc-1.63.0.gem differ: char 132, line 1 ++++++ series ++++++ 0001-Return-Qnil-from-grpc_rb_fork_unsafe_begin-end_api.patch use_system_libs.patch ++++++ use_system_libs.patch ++++++ Index: grpc-1.63.0/src/ruby/ext/grpc/extconf.rb =================================================================== --- grpc-1.63.0.orig/src/ruby/ext/grpc/extconf.rb +++ grpc-1.63.0/src/ruby/ext/grpc/extconf.rb @@ -16,6 +16,7 @@ require 'etc' require 'mkmf' require_relative '../../lib/grpc/version.rb' +=begin windows = RUBY_PLATFORM =~ /mingw|mswin/ windows_ucrt = RUBY_PLATFORM =~ /(mingw|mswin).*ucrt/ bsd = RUBY_PLATFORM =~ /bsd/ @@ -30,6 +31,7 @@ grpc_root = File.expand_path(File.join(F grpc_config = ENV['GRPC_CONFIG'] || 'opt' ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.10' +=end def debug_symbols_output_dir d = ENV['GRPC_RUBY_DEBUG_SYMBOLS_OUTPUT_DIR'] @@ -82,6 +84,7 @@ inherit_env_or_rbconfig 'STRIP' inherit_rbconfig 'CPPFLAGS' inherit_rbconfig('LDFLAGS', linker_flag: true) +=begin ENV['LD'] = ENV['CC'] if env_unset?('LD') ENV['LDXX'] = ENV['CXX'] if env_unset?('LDXX') @@ -108,6 +111,7 @@ if apple_toolchain && !cross_compiling ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' end end +=end env_append 'CPPFLAGS', '-DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\""' @@ -116,6 +120,7 @@ env_append 'CPPFLAGS', '-DGRPC_XDS_USER_ env_append 'CPPFLAGS', '-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1' output_dir = File.expand_path(RbConfig::CONFIG['topdir']) +=begin grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) ENV['BUILDDIR'] = output_dir @@ -145,6 +150,7 @@ $DLDFLAGS = maybe_remove_strip_all_linke $CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt $CFLAGS << ' -I' + File.join(grpc_root, 'include') $CFLAGS << ' -g' +=end def have_ruby_abi_version() return true if RUBY_ENGINE == 'truffleruby' @@ -173,6 +179,7 @@ def ext_export_filename() name end +=begin ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename()) $LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux if apple_toolchain @@ -195,11 +202,13 @@ if linux && RUBY_ENGINE != 'truffleruby' $LDFLAGS << ' -static-libgcc -static-libstdc++' end $LDFLAGS << ' -static' if windows +=end $CFLAGS << ' -std=c11 ' $CFLAGS << ' -Wall ' $CFLAGS << ' -Wextra ' $CFLAGS << ' -pedantic ' +$LDFLAGS << ' -lgrpc ' output = File.join('grpc', 'grpc_c') puts "extconf.rb $LDFLAGS: #{$LDFLAGS}" @@ -208,6 +217,7 @@ puts "extconf.rb $CFLAGS: #{$CFLAGS}" puts 'Generating Makefile for ' + output create_makefile(output) +=begin ruby_major_minor = /(\d+\.\d+)/.match(RUBY_VERSION).to_s debug_symbols = "grpc-#{GRPC::VERSION}-#{RUBY_PLATFORM}-ruby-#{ruby_major_minor}.dbg" @@ -264,3 +274,4 @@ if ENV['GRPC_RUBY_TEST_ONLY_WORKAROUND_M end File.rename('Makefile.new', 'Makefile') end +=end
