Update to asciidoctor 2.0.12.

Resolves: rhbz#1893940
This commit is contained in:
Pavel Valena 2020-12-16 04:00:22 +01:00
parent 1f2c7cb1de
commit 00da97c840
3 changed files with 47 additions and 6 deletions

View File

@ -0,0 +1,37 @@
From 62014851b087071339d19b5313e5676766aabe90 Mon Sep 17 00:00:00 2001
From: Dan Allen <dan.j.allen@gmail.com>
Date: Fri, 22 Jan 2021 03:18:10 -0700
Subject: [PATCH] resolves #3916 upgrade rouge and fix test assertion (PR
#3920)
---
asciidoctor.gemspec | 2 +-
test/syntax_highlighter_test.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/asciidoctor.gemspec b/asciidoctor.gemspec
index 66d70eb25..d12c24614 100644
--- a/asciidoctor.gemspec
+++ b/asciidoctor.gemspec
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'nokogiri', '~> 1.10.0'
s.add_development_dependency 'rake', '~> 12.3.0'
# Asciidoctor supports Rouge >= 2
- s.add_development_dependency 'rouge', '~> 3.15.0'
+ s.add_development_dependency 'rouge', '~> 3.26.0'
s.add_development_dependency 'rspec-expectations', '~> 3.8.0'
s.add_development_dependency 'slim', '~> 4.0.0'
s.add_development_dependency 'tilt', '~> 2.0.0'
diff --git a/test/syntax_highlighter_test.rb b/test/syntax_highlighter_test.rb
index 0a96ee96b..7b8502b1e 100644
--- a/test/syntax_highlighter_test.rb
+++ b/test/syntax_highlighter_test.rb
@@ -758,7 +758,7 @@ def highlight?
output = convert_string_to_embedded input, safe: :safe, attributes: { 'source-highlighter' => 'rouge' }
assert_css 'pre.rouge > code[data-lang="php"]', output, 1
# if class is "nb", then the funcnamehighlighting option is not honored
- assert_include '<span class="nx">cal_days_in_month</span>', output
+ refute_include '<span class="nb">cal_days_in_month</span>', output
assert_include '<span class="mi">2019</span>', output
end

View File

@ -6,14 +6,14 @@
Summary: A fast, open source AsciiDoc implementation in Ruby
Name: rubygem-%{gem_name}
Version: 2.0.10
Release: 5%{?dist}
Version: 2.0.12
Release: 1%{?dist}
License: MIT
URL: https://asciidoctor.org
Source0: https://github.com/asciidoctor/asciidoctor/archive/%{gittag}/%{gem_name}-%{version}%{pre}.tar.gz
# Add support for erubi template engine; use it in place of erubis in test suite.
# https://github.com/asciidoctor/asciidoctor/pull/3738
Patch0: rubygem-asciidoctor-2.0.11-add-support-for-erubi-template-engine.patch
# Fix test failure
# https://github.com/asciidoctor/asciidoctor/issues/3916
Patch0: https://github.com/asciidoctor/asciidoctor/commit/62014851b.patch#/0001-resolves-3916-upgrade-rouge-and-fix-test-assertion-P.patch
%if 0%{?el7}
Requires: ruby(release)
BuildRequires: ruby(release)
@ -128,6 +128,10 @@ cp -a .%{gem_instdir}/man/*.1 \
%doc %{gem_docdir}
%changelog
* Wed Jan 27 2021 Pavel Valena <pvalena@redhat.com> - 2.0.12-1
- Update to asciidoctor 2.0.12.
Resolves: rhbz#1893940
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (asciidoctor-2.0.10.tar.gz) = 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
SHA512 (asciidoctor-2.0.12.tar.gz) = b1fdfd8907d19943bebc9040e3e541df81eb874bf9d53a174e5be8a804e117e7ee3cd21046a4a4142cdc285e6269796d06915b0f42f4f16ae1e8975e444a8a76