Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-google-protobuf for
openSUSE:Factory checked in at 2022-11-03 19:59:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-google-protobuf (Old)
and /work/SRC/openSUSE:Factory/.rubygem-google-protobuf.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-google-protobuf"
Thu Nov 3 19:59:31 2022 rev:4 rq:1033041 version:3.21.9
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-google-protobuf/rubygem-google-protobuf.changes
2022-10-30 18:29:02.706452187 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-google-protobuf.new.2275/rubygem-google-protobuf.changes
2022-11-03 19:59:37.044059349 +0100
@@ -1,0 +2,19 @@
+Thu Nov 3 11:16:58 UTC 2022 - Marcus Rueckert <[email protected]>
+
+- cleanup gem2rpm.yml:
+ - preamble:
+ - this works for 2.5 and up just fine so disabling 2.7 is not
+ needed.
+ - post install:
+ - we do not need to set +x bit just because the file has a she
+ bang line. it is clearly a library.
+ - use print0/xargs -r0 to avoid any problems with paths with
+ whitespaces.
+
+-------------------------------------------------------------------
+Thu Nov 3 11:01:20 UTC 2022 - Marcus Rueckert <[email protected]>
+
+- Add do-not-wrap.patch:
+ * wrapping memcpy caused loading 'google/protobuf' to hang
+
+-------------------------------------------------------------------
New:
----
do-not-wrap.patch
series
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-google-protobuf.spec ++++++
--- /var/tmp/diff_new_pack.hlrss1/_old 2022-11-03 19:59:38.152065833 +0100
+++ /var/tmp/diff_new_pack.hlrss1/_new 2022-11-03 19:59:38.156065856 +0100
@@ -29,11 +29,6 @@
%define mod_name google-protobuf
%define mod_full_name %{mod_name}-%{version}
# MANUAL
-%global _lto_cflags %{nil}
-%if 0%{?suse_version} > 1500
-%define rb_build_versions ruby31
-%define rb_build_ruby_abi ruby:3.1.0
-%endif
# /MANUAL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{rubydevel >= 2.3}
@@ -42,7 +37,11 @@
URL: https://developers.google.com/protocol-buffers
Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: rubygem-google-protobuf-rpmlintrc
-Source2: gem2rpm.yml
+Source2: series
+Source3: gem2rpm.yml
+# MANUAL
+Patch0: do-not-wrap.patch
+# /MANUAL
Summary: Protocol Buffers
License: BSD-3-Clause
Group: Development/Languages/Ruby
@@ -51,6 +50,10 @@
Protocol Buffers are Google's data interchange format.
%prep
+%gem_unpack
+%patch0 -p1
+find -type f -print0 | xargs -0 touch -r %{S:0}
+%gem_build
%build
@@ -59,9 +62,8 @@
-f
%gem_cleanup
# MANUAL
-find %{buildroot}/%{_libdir}/ruby/gems/ \( -name '.sitearchdir.-.google.time'
\) | xargs rm
-find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ruby-upb.c' -o -name
'ruby-upb.h' \) | xargs chmod -x
-find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'descriptor_dsl.rb' \) |
xargs chmod +x
+find %{buildroot}/%{_libdir}/ruby/gems/ \( -name '.sitearchdir.-.google.time'
\) -delete
+find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ruby-upb.c' -o -name
'ruby-upb.h' \) -print0 | xargs -r0 chmod -x
# /MANUAL
%gem_packages
++++++ do-not-wrap.patch ++++++
Index: google-protobuf-3.21.5/ext/google/protobuf_c/extconf.rb
===================================================================
--- google-protobuf-3.21.5.orig/ext/google/protobuf_c/extconf.rb
+++ google-protobuf-3.21.5/ext/google/protobuf_c/extconf.rb
@@ -13,16 +13,16 @@ else
end
-if RUBY_PLATFORM =~ /linux/
- # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
- $LDFLAGS += " -Wl,-wrap,memcpy"
-end
+# if RUBY_PLATFORM =~ /linux/
+# # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
+# $LDFLAGS += " -Wl,-wrap,memcpy"
+# end
$VPATH << "$(srcdir)/third_party/utf8_range"
$INCFLAGS << "$(srcdir)/third_party/utf8_range"
$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
- "repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",
+ "repeated_field.c", "map.c", "ruby-upb.c",
"naive.c", "range2-neon.c", "range2-sse.c"]
create_makefile(ext_name)
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.hlrss1/_old 2022-11-03 19:59:38.216066207 +0100
+++ /var/tmp/diff_new_pack.hlrss1/_new 2022-11-03 19:59:38.220066231 +0100
@@ -15,12 +15,6 @@
# ## used by gem2rpm
# :disable_automatic_rdoc_dep: true
# ## used by gem2rpm
-:preamble: |-
- %global _lto_cflags %{nil}
- %if 0%{?suse_version} > 1500
- %define rb_build_versions ruby31
- %define rb_build_ruby_abi ruby:3.1.0
- %endif
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
@@ -39,9 +33,8 @@
# %endif
# ## used by gem2rpm
:post_install: |-
- find %{buildroot}/%{_libdir}/ruby/gems/ \( -name
'.sitearchdir.-.google.time' \) | xargs rm
- find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ruby-upb.c' -o -name
'ruby-upb.h' \) | xargs chmod -x
- find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'descriptor_dsl.rb' \) |
xargs chmod +x
+ find %{buildroot}/%{_libdir}/ruby/gems/ \( -name
'.sitearchdir.-.google.time' \) -delete
+ find %{buildroot}/%{_libdir}/ruby/gems/ \( -name 'ruby-upb.c' -o -name
'ruby-upb.h' \) -print0 | xargs -r0 chmod -x
# ## used by gem2rpm
# :testsuite_command: |-
# (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test)
@@ -74,6 +67,9 @@
# :post: |-
# /bin/echo foo
#
+:patches:
+ do-not-wrap.patch: -p1
:sources:
- rubygem-google-protobuf-rpmlintrc
+ - series
++++++ series ++++++
do-not-wrap.patch
