Hello community,
here is the log from the commit of package rubygem-nokogiri for
openSUSE:Factory checked in at 2020-06-11 14:44:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-nokogiri (Old)
and /work/SRC/openSUSE:Factory/.rubygem-nokogiri.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-nokogiri"
Thu Jun 11 14:44:57 2020 rev:48 rq:812711 version:1.10.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-nokogiri/rubygem-nokogiri.changes
2020-03-06 21:23:46.553432132 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-nokogiri.new.3606/rubygem-nokogiri.changes
2020-06-11 14:45:09.685462806 +0200
@@ -1,0 +2,7 @@
+Mon Jun 8 16:33:00 UTC 2020 - Marcus Rueckert <[email protected]>
+
+- add fix so we no longer need mini_portile2. This is only needed
+ when not building against system libraries (boo#1171881)
+ https://github.com/sparklemotion/nokogiri/issues/2033
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-nokogiri.spec ++++++
--- /var/tmp/diff_new_pack.nD3hsT/_old 2020-06-11 14:45:11.441467921 +0200
+++ /var/tmp/diff_new_pack.nD3hsT/_new 2020-06-11 14:45:11.449467944 +0200
@@ -33,7 +33,6 @@
%define rb_build_versions ruby25 ruby26
%define rb_build_ruby_abis ruby:2.5.0 ruby:2.6.0
%endif
-BuildRequires: %{rubygem mini_portile2:2.3}
BuildRequires: %{rubygem pkg-config}
BuildRequires: libxml2-devel >= 2.6.21
BuildRequires: libxslt-devel
@@ -60,10 +59,25 @@
%prep
+
%build
%install
# MANUAL
+%gem_unpack
+#########################################################################
+#
+# IMPORTANT!
+#
+# This is not covered by our gem2rpm automation yet. If you see it removed
+# in the diff please add it back
+#
+# IMPORTANT!
+#
+#########################################################################
+sed -i -e 's/.*mini_portile.*//g' %{mod_full_name}.gemspec
+find -type f -print0 | xargs -0 touch -r %{S:0}
+%gem_build
export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
# /MANUAL
%gem_install \
@@ -72,7 +86,7 @@
-f
%gem_cleanup
# MANUAL
-rm -rf %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ports
+rm -rvf %{buildroot}%{_libdir}/ruby/gems/*/gems/%{mod_full_name}/ports
# /MANUAL
%gem_packages
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.nD3hsT/_old 2020-06-11 14:45:11.493468073 +0200
+++ /var/tmp/diff_new_pack.nD3hsT/_new 2020-06-11 14:45:11.497468084 +0200
@@ -22,12 +22,12 @@
%endif
BuildRequires: libxml2-devel >= 2.6.21
BuildRequires: libxslt-devel
- BuildRequires: %{rubygem mini_portile2:2.3}
BuildRequires: %{rubygem pkg-config}
# BuildRequires: foobar
# Requires: foobar
# ## used by gem2rpm
-#:patches
+# :patches:
+# no-more-mini_portile.patch: -p0
:sources:
- rubygem-nokogiri-rpmlintrc
# - foo.desktop
@@ -35,9 +35,23 @@
# :gem_install_args: '....'
# ## used by gem2rpm
:pre_install: |-
+ %gem_unpack
+ #########################################################################
+ #
+ # IMPORTANT!
+ #
+ # This is not covered by our gem2rpm automation yet. If you see it removed
+ # in the diff please add it back
+ #
+ # IMPORTANT!
+ #
+ #########################################################################
+ sed -i -e 's/.*mini_portile.*//g' %{mod_full_name}.gemspec
+ find -type f -print0 | xargs -0 touch -r %{S:0}
+ %gem_build
export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
:post_install: |-
- rm -rf %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ports
+ rm -rvf %{buildroot}%{_libdir}/ruby/gems/*/gems/%{mod_full_name}/ports
# %if 0%{?use_system_libev}
# export USE_VENDORED_LIBEV="no"
# %endif
