22
0

Update to 1.19.4 and regenerate spec to drop update-alternatives dependency

This commit is contained in:
Steven R. Baker
2026-06-13 15:47:20 +02:00
parent 98ebe5977e
commit b7a97d2492
6 changed files with 246 additions and 26 deletions
+200 -6
View File
@@ -1,3 +1,164 @@
-------------------------------------------------------------------
Mon Jun 22 22:54:57 UTC 2026 - Marcus Rueckert <mrueckert@suse.de>
- 1.19.4:
see included CHANGELOG.md
-------------------------------------------------------------------
Wed Feb 18 19:44:00 UTC 2026 - Marcus Rueckert <mrueckert@suse.de>
- 1.19.1:
see included CHANGELOG.md
-------------------------------------------------------------------
Mon Sep 15 16:14:03 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.10:
see included CHANGELOG.md
-------------------------------------------------------------------
Tue Aug 19 09:25:05 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.9:
see included CHANGELOG.md
-------------------------------------------------------------------
Thu May 15 23:06:02 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.8:
see included CHANGELOG.md
-------------------------------------------------------------------
Thu Apr 17 14:35:50 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.7:
see included CHANGELOG.md
-------------------------------------------------------------------
Wed Mar 19 23:03:03 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.5:
see included CHANGELOG.md
-------------------------------------------------------------------
Wed Jan 22 04:13:45 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
- 1.18.2:
see included CHANGELOG.md
-------------------------------------------------------------------
Mon Dec 16 16:59:42 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- 1.17.2:
see included CHANGELOG.md
-------------------------------------------------------------------
Mon Dec 9 16:31:28 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- allow other versions than ruby 3.3
-------------------------------------------------------------------
Tue Jul 30 14:24:17 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- 1.16.7:
- update intree libxml2 copy (unused in our build)
-------------------------------------------------------------------
Sat Jul 27 18:46:12 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- 1.16.6:
- update intree libxml2 copy (unused in our build)
- update intree zlib copy (unused in our build)
- [CRuby] `XML::Reader` sets the `@encoding` instance variable
during reading if it is not passed into the initializer.
Previously, it would remain `nil`. The behavior of
`Reader#encoding` has not changed. This works around changes to
how libxml2 reports the encoding used in v2.12.6.
- [CRuby] `XML::Reader` defaults the encoding to UTF-8 if it's
not specified in either the document or as a method parameter.
Previously non-ASCII characters were serialized as NCRs in this
case. [#2891] (@flavorjones)
- [CRuby] Restored support for compilation by GCC versions
earlier than 4.6, which was broken in v1.15.0 (540e9aee).
[#3090] (@adfoster-r7)
- [CRuby] Patched upstream libxml2 to allow parsing HTML5 in the
context of a namespaced node (e.g., foreign content like
MathML). [#3112, #3116] (@flavorjones)
- [CRuby] Fixed a small memory leak in libgumbo (HTML5 parser)
when the maximum tree depth limit is hit. [#3098, #3100]
(@stevecheckoway)
- Drop gcc14-allow-incompatible-pointer-types-for-now.patch
-------------------------------------------------------------------
Fri Jul 26 12:49:30 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- Added gcc14-allow-incompatible-pointer-types-for-now.patch:
gcc 14 errors out on incompatible pointer types
Allow those until https://github.com/sparklemotion/nokogiri/issues/3295
is fixed
-------------------------------------------------------------------
Tue Jul 9 14:34:25 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- Added only-complain-about-version-diff-if-it-is-older.patch
boo#1202053 boo#1213999 boo#1203728
-------------------------------------------------------------------
Thu Jan 18 16:00:05 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- limit ruby versions to 3.x
-------------------------------------------------------------------
Thu Jan 18 15:56:29 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
- 1.16.0:
This release introduces native gem support for Ruby 3.3.
This release ends support for Ruby 2.7, for which
[upstream support ended 2023-03-31](https://www.ruby-lang.org/en/downloads/branches/).
#### Pattern matching
This version marks _official support_ for the pattern matching
API in `XML::Attr`, `XML::Document`, `XML::DocumentFragment`,
`XML::Namespace`, `XML::Node`, and `XML::NodeSet` (and their
subclasses), originally introduced as an experimental feature in
v1.14.0. (@flavorjones)
Documentation on what can be matched:
* [`XML::Attr#deconstruct_keys`](https://nokogiri.org/rdoc/Nokogiri/XML/Attr.html?h=deconstruct#method-i-deconstruct_keys)
* [`XML::Document#deconstruct_keys`](https://nokogiri.org/rdoc/Nokogiri/XML/Document.html?h=deconstruct#method-i-deconstruct_keys)
* [`XML::Namespace#deconstruct_keys`](https://nokogiri.org/rdoc/Nokogiri/XML/Namespace.html?h=deconstruct+namespace#method-i-deconstruct_keys)
* [`XML::Node#deconstruct_keys`](https://nokogiri.org/rdoc/Nokogiri/XML/Node.html?h=deconstruct#method-i-deconstruct_keys)
* [`XML::DocumentFragment#deconstruct`](https://nokogiri.org/rdoc/Nokogiri/XML/DocumentFragment.html?h=deconstruct#method-i-deconstruct)
* [`XML::NodeSet#deconstruct`](https://nokogiri.org/rdoc/Nokogiri/XML/NodeSet.html?h=deconstruct#method-i-deconstruct)
### Dependencies
* [CRuby] Vendored libxml2 is updated to v2.12.3 from v2.11.6. (@flavorjones)
* https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
* https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1
* https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.2
* https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.3
### Fixed
* CSS `nth` pseudo-classes now handle spaces, e.g. `"2n + 1"`. [#3018] (@fusion2004)
* [CRuby] `libgumbo` no longer leaks memory when an incomplete tag is abandoned by the HTML5 parser. [#3036] (@flavorjones)
### Removed
* Removed `Nokogiri::HTML5.get` which was deprecated in v1.12.0. [#2278] (@flavorjones)
* Removed the CSS-to-XPath utility modules `XPathVisitorAlwaysUseBuiltins` and `XPathVisitorOptimallyUseBuiltins`, which were deprecated in v1.13.0 in favor of `XPathVisitor` constructor args. [#2403] (@flavorjones)
* Removed `XML::Reader#attribute_nodes` which was deprecated in v1.13.8 in favor of `#attribute_hash`. [#2598, #2599] (@flavorjones)
* [CRuby] Removed the `libxml/libxml2_path` key from `VersionInfo`, used in the past for third-party library integration, in favor of the `nokogiri/cppflags` and `nokogiri/ldflags` keys. Please note that third-party library integration is not fully supported and may be deprecated soon, see #2746 for more context. [#2143] (@flavorjones)
-------------------------------------------------------------------
Tue Nov 28 08:13:47 UTC 2023 - Dan Čermák <dan.cermak@posteo.net>
@@ -660,19 +821,52 @@ Mon Oct 2 13:09:53 UTC 2023 - Martin Vidner <mvidner@suse.com>
- Buildrequire openssl gem to fix building with Ruby 3.0
-------------------------------------------------------------------
Sat Aug 26 04:32:35 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
- updated to version 1.15.4
see installed CHANGES.md
-------------------------------------------------------------------
Thu Jun 22 00:08:39 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
- updated to version 1.15.2
see installed CHANGES.md
-------------------------------------------------------------------
Sun May 14 01:31:08 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
- cleanup ruby version restrictions
-------------------------------------------------------------------
Fri Apr 21 13:29:16 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
- updated to version 1.14.3
see installed CHANGES.md
-------------------------------------------------------------------
Thu Feb 23 19:12:16 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
- updated to version 1.14.2
see installed CHANGES.md
-------------------------------------------------------------------
Thu Dec 22 10:46:21 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
- updated to version 1.13.9
see installed CHANGES.md
-------------------------------------------------------------------
Fri Oct 28 05:01:51 UTC 2022 - Stephan Kulow <coolo@suse.com>
updated to version 1.13.9
see installed CHANGES.md
- updated to version 1.13.9
see installed CHANGES.md
-------------------------------------------------------------------
Thu Aug 4 13:20:37 UTC 2022 - Stephan Kulow <coolo@suse.com>
updated to version 1.13.8
see installed CHANGES.md
- updated to version 1.13.8
see installed CHANGES.md
-------------------------------------------------------------------
Mon May 30 12:28:02 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+13 -11
View File
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-nokogiri
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,33 +24,30 @@
#
Name: rubygem-nokogiri
Version: 1.15.5
Version: 1.19.4
Release: 0
%define mod_name nokogiri
%define mod_full_name %{mod_name}-%{version}
# MANUAL
%if 0%{?suse_version} == 1500
%define rb_build_versions ruby31 ruby27
%define rb_build_ruby_abis ruby:3.1.0 ruby:2.7.0
%endif
BuildRequires: %{rubygem mini_portile2 >= 2.8}
BuildRequires: %{rubygem mini_portile2 >= 2.8.2}
BuildRequires: %{rubygem openssl}
BuildRequires: %{rubygem pkg-config}
BuildRequires: libxml2-devel >= 2.6.21
BuildRequires: libxslt-devel
# /MANUAL
BuildRequires: ruby-macros >= 5
BuildRequires: %{rubydevel >= 2.7.0}
BuildRequires: %{rubydevel >= 3.2}
BuildRequires: %{rubygem gem2rpm}
BuildRequires: %{rubygem rdoc > 3.10}
BuildRequires: update-alternatives
BuildRequires: ruby-macros >= 5
URL: https://nokogiri.org
Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: rubygem-nokogiri-rpmlintrc
Source2: gem2rpm.yml
# MANUAL
Patch0: only-complain-about-version-diff-if-it-is-older.patch
# /MANUAL
Summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML
License: MIT
PreReq: update-alternatives
%description
Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.
@@ -61,6 +58,10 @@ fast and standards-compliant by relying on native parsers like libxml2,
libgumbo, or xerces.
%prep
%gem_unpack
%patch -P 0 -p1
find -type f -print0 | xargs -0 touch -r %{S:0}
%gem_build
%build
@@ -87,6 +88,7 @@ cd ..
export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
# /MANUAL
%gem_install \
--no-rdoc --no-ri \
--symlink-binaries \
--doc-files="LICENSE.md README.md" \
-f
+4 -6
View File
@@ -16,11 +16,7 @@
# :disable_automatic_rdoc_dep: true
# ## used by gem2rpm
:preamble: |-
%if 0%{?suse_version} == 1500
%define rb_build_versions ruby31 ruby27
%define rb_build_ruby_abis ruby:3.1.0 ruby:2.7.0
%endif
BuildRequires: %{rubygem mini_portile2 >= 2.8}
BuildRequires: %{rubygem mini_portile2 >= 2.8.2}
BuildRequires: %{rubygem openssl}
BuildRequires: %{rubygem pkg-config}
BuildRequires: libxml2-devel >= 2.6.21
@@ -30,6 +26,8 @@
# ## used by gem2rpm
# :patches:
# no-more-mini_portile.patch: -p0
:patches:
only-complain-about-version-diff-if-it-is-older.patch: -p1
:sources:
- rubygem-nokogiri-rpmlintrc
# - foo.desktop
@@ -96,4 +94,4 @@
# bar
# :post: |-
# /bin/echo foo
#
#
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
@@ -0,0 +1,26 @@
diff --git a/lib/nokogiri/version/info.rb b/lib/nokogiri/version/info.rb
index 95f29e56..427b79ad 100644
--- a/lib/nokogiri/version/info.rb
+++ b/lib/nokogiri/version/info.rb
@@ -2,6 +2,7 @@
require "singleton"
require "shellwords"
+require "rubygems"
module Nokogiri
class VersionInfo # :nodoc:
@@ -73,11 +74,11 @@ module Nokogiri
warnings = []
if libxml2?
- if compiled_libxml_version != loaded_libxml_version
+ if Gem::Version.new(compiled_libxml_version) > Gem::Version.new(loaded_libxml_version)
warnings << "Nokogiri was built against libxml version #{compiled_libxml_version}, but has dynamically loaded #{loaded_libxml_version}"
end
- if compiled_libxslt_version != loaded_libxslt_version
+ if Gem::Version.new(compiled_libxslt_version) > Gem::Version.new(loaded_libxslt_version)
warnings << "Nokogiri was built against libxslt version #{compiled_libxslt_version}, but has dynamically loaded #{loaded_libxslt_version}"
end
end