From 849d27376e62f885b436ebbb020a5ed9bdfcac20 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 5 Feb 2021 05:31:12 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rubygem-asciidoctor.git#00da97c8409c993966e7ea94c1fc7be464af3788 --- ...grade-rouge-and-fix-test-assertion-P.patch | 37 +++++++++++++++++++ rubygem-asciidoctor.spec | 21 +++++++---- sources | 2 +- 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 0001-resolves-3916-upgrade-rouge-and-fix-test-assertion-P.patch diff --git a/0001-resolves-3916-upgrade-rouge-and-fix-test-assertion-P.patch b/0001-resolves-3916-upgrade-rouge-and-fix-test-assertion-P.patch new file mode 100644 index 0000000..8db29bd --- /dev/null +++ b/0001-resolves-3916-upgrade-rouge-and-fix-test-assertion-P.patch @@ -0,0 +1,37 @@ +From 62014851b087071339d19b5313e5676766aabe90 Mon Sep 17 00:00:00 2001 +From: Dan Allen +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 'cal_days_in_month', output ++ refute_include 'cal_days_in_month', output + assert_include '2019', output + end + diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec index d93a6b8..f9debc8 100644 --- a/rubygem-asciidoctor.spec +++ b/rubygem-asciidoctor.spec @@ -6,14 +6,14 @@ Summary: A fast, open source AsciiDoc implementation in Ruby Name: rubygem-%{gem_name} -Version: 2.0.10 -Release: 4%{?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) @@ -25,7 +25,7 @@ BuildRequires: ruby(abi) = 1.8 %endif BuildRequires: rubygems-devel BuildRequires: ruby(rubygems) -%if 0%{?el6} || 0%{?el7} +%if 0%{?rhel} # Dependencies aren't available on EPEL %else BuildRequires: rubygem(coderay) @@ -82,7 +82,7 @@ gem build %{gem_name}.gemspec %check pushd .%{gem_instdir} -%if 0%{?el6} || 0%{?el7} +%if 0%{?rhel} # Asciidoctor tests require Minitest 5, so we can't run them on EPEL %else LANG=C.UTF-8 ruby -I"lib:test" -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' @@ -128,6 +128,13 @@ cp -a .%{gem_instdir}/man/*.1 \ %doc %{gem_docdir} %changelog +* Wed Jan 27 2021 Pavel Valena - 2.0.12-1 +- Update to asciidoctor 2.0.12. + Resolves: rhbz#1893940 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Aug 19 2020 Vít Ondruch - 2.0.10-4 - Replace build time Erubis dependency by Erubi. diff --git a/sources b/sources index a3731a7..5826894 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (asciidoctor-2.0.10.tar.gz) = 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe +SHA512 (asciidoctor-2.0.12.tar.gz) = b1fdfd8907d19943bebc9040e3e541df81eb874bf9d53a174e5be8a804e117e7ee3cd21046a4a4142cdc285e6269796d06915b0f42f4f16ae1e8975e444a8a76