Compare commits

...

10 Commits

Author SHA1 Message Date
Mohan Boddu 136a45ce08 Rebuilt for IMA sigs, glibc 2.34, aarch64 flags 2023-05-19 09:30:52 +00:00
Vít Ondruch 54ab583cd2 Drop `tidy` dependency.
There are some non-essential tests skipped due to missing tidy, but in
exchange this helps to reduce dependency chain a bit.

Related: rhbz#1951246
2021-05-25 10:33:37 +02:00
Vít Ondruch 1d42a4d403 Disable rubygem(stringex) dependency.
ba30adbfac

Related: rhbz#1951246
2021-05-14 15:35:00 +02:00
Vít Ondruch 915fc2c333 Drop Latex test cases.
Texlive does not xpatch extensions and therefore some test cases fail:

~~~
  1) Failure:
TestFiles#test_/builddir/build/BUILD/kramdown-2_3_1/usr/share/gems/gems/kramdown-2_3_1/test/testcases/span/04_footnote/backlink_inline_text_to_latex_compilation [/builddir/build/BUILD/kramdown-2.3.1/usr/share/gems/gems/kramdown-2.3.1/test/test_files.rb:153]:
 LaTeX Error: File `xpatch.sty' not found.
 Paragraph ended before \deferred@thm@head was complete.
<to be read again>
 LaTeX Error: Missing \begin{document}.
 LaTeX Error: \begin{document} ended by \end{quotation}.
 Paragraph ended before \@xverbatim was complete.
<to be read again>
~~~

Let Texlive maintainer to decide the essential components. The Latex
functionality is not crucial from Kramdown.

Resolves: rhbz#1951246
2021-05-14 15:20:17 +02:00
Mohan Boddu 9aa082a163 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2021-04-16 05:20:30 +00:00
DistroBaker 484415b064 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-kramdown.git#a2769f11b9e3edcee64f393718d4ae488adf9ba5
2021-03-25 01:20:27 +00:00
DistroBaker 834694f141 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-kramdown.git#3c0d31911dc4cad7a0ca79a95e28d07b24fab8d6
2021-02-19 12:27:13 +00:00
DistroBaker e7cf450fac 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-kramdown.git#3c0d31911dc4cad7a0ca79a95e28d07b24fab8d6
2021-02-17 12:36:21 +01:00
DistroBaker fdf7afe286 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-kramdown.git#3c0d31911dc4cad7a0ca79a95e28d07b24fab8d6
2021-02-16 13:00:26 +00:00
DistroBaker 8d122a5b56 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-kramdown.git#eaab3a571ba273bd44958c2ffb57aef4769eb72c
2021-02-09 20:11:53 +01:00
5 changed files with 38 additions and 57 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/kramdown-2.1.0.gem
/kramdown-2.2.1.gem
/kramdown-2.3.0.gem
/kramdown-2.3.1.gem

View File

@ -0,0 +1 @@
5be8b0f17e0db42297c0434e526676e0a258ef52 kramdown-2.3.1.gem

View File

@ -1,35 +0,0 @@
From e1beb51af7fe4ecb85dbab7328f47a23c86c7df2 Mon Sep 17 00:00:00 2001
From: Thomas Leitner <t_leitner@gmx.at>
Date: Wed, 6 Jan 2021 16:05:10 +0100
Subject: [PATCH] Fix failing tests due to changes in rouge
---
Rakefile | 2 +-
test/testcases/block/06_codeblock/rouge/multiple.html | 2 +-
test/testcases/block/06_codeblock/rouge/simple.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/testcases/block/06_codeblock/rouge/multiple.html b/test/testcases/block/06_codeblock/rouge/multiple.html
index 03eddb47..6ece5432 100644
--- a/test/testcases/block/06_codeblock/rouge/multiple.html
+++ b/test/testcases/block/06_codeblock/rouge/multiple.html
@@ -6,6 +6,6 @@
</code></pre>
</div></div></div>
-<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
</code></pre>
</div></div></div>
diff --git a/test/testcases/block/06_codeblock/rouge/simple.html b/test/testcases/block/06_codeblock/rouge/simple.html
index 10f280a3..1c2259af 100644
--- a/test/testcases/block/06_codeblock/rouge/simple.html
+++ b/test/testcases/block/06_codeblock/rouge/simple.html
@@ -5,6 +5,6 @@
</code></pre>
</div></div>
-<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
</code></pre>
</div></div>

View File

@ -2,33 +2,19 @@
%global gem_name kramdown
Name: rubygem-%{gem_name}
Version: 2.3.0
Release: 1%{?dist}
Version: 2.3.1
Release: 5%{?dist}
Summary: Fast, pure-Ruby Markdown-superset converter
License: MIT
URL: http://kramdown.rubyforge.org
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# https://github.com/gettalong/kramdown/commit/e1beb51af7fe4ecb85dbab7328f47a23c86c7df2
Patch2: rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: rubygem(minitest) >= 5
BuildRequires: rubygem(rexml)
BuildRequires: rubygem(rouge) >= 3.26.0
BuildRequires: rubygem(test-unit)
BuildRequires: rubygem(stringex)
# Recommends: rubygem(stringex)
# Some additional dependency for check
BuildRequires: tidy
BuildRequires: tex
BuildRequires: tex(acronym.sty)
BuildRequires: tex(amssymb.sty)
BuildRequires: tex(amsmath.sty)
BuildRequires: tex(amsthm.sty)
BuildRequires: tex(amsfonts.sty)
BuildRequires: tex(utf8x.def)
BuildRequires: tex-ec
Requires: ruby(release)
Requires: ruby(rubygems)
BuildArch: noarch
@ -48,13 +34,11 @@ BuildArch: noarch
Documentation for %{name}
%prep
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
%patch2 -p1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%setup -q -n %{gem_name}-%{version}
mv ../%{gem_name}-%{version}.gemspec .
%build
gem build %{gem_name}.gemspec
gem build %{gem_name}-%{version}.gemspec
%gem_install
%install
@ -83,6 +67,12 @@ LANG=C.UTF-8
pushd .%{gem_instdir}
sed -i test/testcases/block/04_header/with_auto_ids.options \
-e '\@transliterated_header_ids@s|true|false|'
sed -i \
test/testcases/block/04_header/with_auto_ids.* \
-e '\@[Tr]ransliterated@d'
export RUBYLIB=$(pwd)/lib
ruby -e 'Dir.glob "./test/test_*.rb", &method(:require)'
@ -110,6 +100,30 @@ popd
%doc %{gem_docdir}
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.1-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue May 25 2021 Vít Ondruch <vondruch@redhat.com> - 2.3.1-4
- Drop `tidy` dependency.
Related: rhbz#1951246
* Thu May 13 2021 Vít Ondruch <vondruch@redhat.com> - 2.3.1-3
- Drop Latex test cases and disable stringex dependency.
Resolves: rhbz#1951246
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Sun Mar 21 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
- 2.3.1
* Sun Mar 21 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-3
- Apply upstream fix for CVE-2021-28834 (rouge formatter namespace restriction)
* Tue Feb 16 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-2
- Use recent packaging style
* Mon Feb 1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
- 2.3.0
- Speficy rouge version dependency for test suite

View File

@ -1 +1 @@
SHA512 (kramdown-2.3.0.gem) = a3ed8360de9208d5ce658d198763737826db943d23dda7ca9cfd507a4656c39f2b19ece78af87981b1177fe01690d6647c854092b230cf3a8a7d2823dc83d276
SHA512 (kramdown-2.3.1.gem) = d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496