Compare commits

...
Sign in to create a new pull request.

30 commits

Author SHA1 Message Date
Dominik 'Rathann' Mierzejewski
838fb1a9ee updated to 2.0.26 (resolves rhbz#2265214)
- droped upstreamed patches
2025-12-15 13:10:36 +01:00
Mamoru TASAKA
3d7bae2b69 Add logger dep for ruby3_5 2025-11-05 23:11:47 +09:00
Fedora Release Engineering
75de982163 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 12:16:36 +00:00
Fedora Release Engineering
fd4e80e38f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 22:58:59 +00:00
Mamoru TASAKA
1b5b583b1a Backport upstream PR to remove base64 dependency
Backport upstream fix for ruby34 formatting change
2024-11-14 16:33:39 +09:00
Fedora Release Engineering
468fa4fa10 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 19:03:32 +00:00
Fedora Release Engineering
7300f0454d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 16:34:50 +00:00
Fedora Release Engineering
334f9c42aa Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 12:28:57 +00:00
Mamoru TASAKA
4e8fb62bfb Apply the upstream PR to support ruby 3.3 Logger 2023-09-29 15:23:35 +09:00
Fedora Release Engineering
91ff5bc8e0 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 17:20:40 +00:00
Todd Zullinger
22023dba55 improve ruby-2.5 compatibility (epel8)
An unfortunate bug in rdoc-5.0 causes a build failure on epel8.  This is
fixed in ruby-2.6/rdoc-6.0.2¹.  Until/unless the fix is backported to
RHEL-8 (which seems unlikely), we can only patch around this.

Thanks, as usual, to Dan Allen for going above and beyond to patch this
upstream.

¹ https://github.com/ruby/rdoc/pull/586
  a1631aa
2023-05-26 13:25:46 -04:00
Todd Zullinger
bd6465f42a update to asciidoctor 2.0.20 (rhbz#2208089)
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.20
2023-05-18 08:44:45 -04:00
Todd Zullinger
f73db33c50 update to asciidoctor 2.0.19 (rhbz#2208089)
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.19
2023-05-17 21:02:46 -04:00
Todd Zullinger
24ce10d5c7 fixes for ruby-3.2.x and rouge-4.1.0 (rhbz#2171711)
Apply upstream fixes for ruby >= 3.2.0rc1¹ and rouge >= 4.1².

Many thanks to Dan Allen for fixing these issues in very short order!

¹ https://github.com/asciidoctor/asciidoctor/issues/4390
² https://github.com/asciidoctor/asciidoctor/issues/4406
2023-02-21 13:16:44 -05:00
Todd Zullinger
01966d7434 verify SPDX license identifier
According to https://tools.spdx.org/app/check_license/ the contents of
the LICENSE file match the MIT SPDX ID.
2023-02-13 17:05:53 -05:00
Fedora Release Engineering
50b3fbb819 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 20:11:14 +00:00
Todd Zullinger
4c7660f922 update to asciidoctor 2.0.18 (rhbz#1989716)
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.18
2022-10-15 11:50:10 -04:00
Todd Zullinger
8a5e9a406b update to asciidoctor 2.0.17 (rhbz#2113688, FTBFS)
The 2.0.17 release includes fixes for some tests which fail with ruby
3.1.

It also adds some new tests which require the open-uri-cached gem.
Disable those tests until open-uri-cached is packaged.

Helped-by: Michael J Gruber <mjg@fedoraproject.org>
2022-08-07 14:05:42 -04:00
Fedora Release Engineering
d1d7163f3c Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 01:17:17 +00:00
Neal Gompa
3442759132 Simplify RHEL conditionals 2022-01-21 06:38:20 -05:00
Fedora Release Engineering
8280e909de - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 11:49:57 +00:00
Todd Zullinger
ef9b17fa0b remove el6 conditionals
EL-6 ended support in November, 2020.  Drop the remaining conditional
checks which reference it.
2021-04-27 20:43:57 -04:00
Todd Zullinger
70d458cc2d Update to Asciidoctor 2.0.15
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.15
2021-04-27 20:41:55 -04:00
Todd Zullinger
b13d03746d Update to Asciidoctor 2.0.14
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.14
2021-04-19 14:26:24 -04:00
Todd Zullinger
01da4053ee remove upstreamed erubi patch
The patch which added erubi template engine support was released 2.0.12.
Remove the stale patch file.
2021-04-19 14:24:31 -04:00
Todd Zullinger
614cb70e6d Update to Asciidoctor 2.0.13
Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.13
2021-04-10 19:54:40 -04:00
Pavel Valena
00da97c840 Update to asciidoctor 2.0.12.
Resolves: rhbz#1893940
2021-01-28 04:04:03 +01:00
Pavel Valena
1f2c7cb1de Do not run tests for any %{rhel} distros. 2021-01-28 04:00:37 +01:00
Fedora Release Engineering
3994ba328c - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 15:39:19 +00:00
Vít Ondruch
4f30337ed5 Remove build time Erubis dependency. 2020-09-15 09:45:28 +02:00
2 changed files with 104 additions and 16 deletions

View file

@ -6,8 +6,8 @@
Summary: A fast, open source AsciiDoc implementation in Ruby
Name: rubygem-%{gem_name}
Version: 2.0.10
Release: 3%{?dist}
Version: 2.0.26
Release: 1%{?dist}
License: MIT
URL: https://asciidoctor.org
Source0: https://github.com/asciidoctor/asciidoctor/archive/%{gittag}/%{gem_name}-%{version}%{pre}.tar.gz
@ -15,20 +15,15 @@ Source0: https://github.com/asciidoctor/asciidoctor/archive/%{gittag}/%{gem_name
Requires: ruby(release)
BuildRequires: ruby(release)
%endif
%if 0%{?el6}
Requires: ruby(rubygems)
Requires: ruby(abi) = 1.8
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)
BuildRequires: rubygem(concurrent-ruby)
BuildRequires: rubygem(erubis)
BuildRequires: rubygem(erubi)
BuildRequires: rubygem(haml)
BuildRequires: rubygem(logger)
BuildRequires: rubygem(minitest)
BuildRequires: rubygem(nokogiri)
BuildRequires: rubygem(rouge)
@ -37,12 +32,12 @@ BuildRequires: rubygem(tilt)
%endif
BuildArch: noarch
Provides: asciidoctor = %{version}
%if 0%{?el6} || 0%{?el7}
%if 0%{?el7}
Provides: rubygem(%{gem_name}) = %{version}
%endif
%if %{?pre:1}
%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}%{pre}
%global gem_instdir() %{gem_dir}/gems/%{gem_name}-%{version}%{pre}
%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{pre}.gem
%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{pre}.gemspec
%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{pre}
@ -72,6 +67,11 @@ sed -i -e 's/#\(s\.test_files\)/\1/' %{gem_name}.gemspec
# Fix shebang (avoid Requires: /usr/bin/env)
sed -i -e 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' bin/%{gem_name}
# ref: https://github.com/asciidoctor/asciidoctor/issues/4684
# the upstream plans to remove logger dep, but for now
# add logger dep explicitly for ruby3_5
%gemspec_add_dep -g logger -s ./%{gem_name}.gemspec
%build
gem build %{gem_name}.gemspec
%gem_install -n %{gem_name}-%{version}%{pre}.gem
@ -79,9 +79,12 @@ 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
#
# disable tests which require open-uri-cached gem
sed -Ei "/test 'should cache remote (SVG|image) when allow-uri-read, cache-uri, and (inline option|data-uri) are set' do/a \\
skip('open-uri-cached gem is not avaiable on Fedora')" test/blocks_test.rb
LANG=C.UTF-8 ruby -I"lib:test" -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
%endif
popd
@ -100,7 +103,6 @@ cp -a .%{gem_instdir}/man/*.1 \
%{buildroot}%{mandir}/
%files
%{!?_licensedir:%global license %%doc}
%dir %{gem_instdir}
%exclude %{gem_cache}
%exclude %{gem_instdir}/asciidoctor.gemspec
@ -125,6 +127,92 @@ cp -a .%{gem_instdir}/man/*.1 \
%doc %{gem_docdir}
%changelog
* Mon Dec 15 2025 Dominik Mierzejewski <dominik@greysector.net> - 2.0.26-1
- updated to 2.0.26 (resolves rhbz#2265214)
- droped upstreamed patches
* Wed Nov 05 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.20-11
- Add logger dep for ruby3_5
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Nov 14 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.20-8
- Backport upstream PR to remove base64 dependency
- Backport upstream fix for ruby34 formatting change
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Sep 29 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.20-4
- Apply the upstream PR to support ruby 3.3 Logger
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu May 25 2023 Todd Zullinger <tmz@pobox.com> - 2.0.20-2
- improve ruby-2.5 compatibility (epel8)
* Thu May 18 2023 Todd Zullinger <tmz@pobox.com> - 2.0.20-1
- update to asciidoctor 2.0.20 (rhbz#2208089)
* Wed May 17 2023 Todd Zullinger <tmz@pobox.com> - 2.0.19-1
- update to asciidoctor 2.0.19 (rhbz#2208089)
* Mon Feb 20 2023 Todd Zullinger <tmz@pobox.com> - 2.0.18-3
- fixes for ruby-3.2.x and rouge-4.1.0 (rhbz#2171711)
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Oct 15 2022 Todd Zullinger <tmz@pobox.com> - 2.0.18-1
- update to asciidoctor 2.0.18 (rhbz#1989716)
* Tue Aug 02 2022 Todd Zullinger <tmz@pobox.com> - 2.0.17-1
- update to asciidoctor 2.0.17 (rhbz#2113688)
- disable tests which require open-uri-cached gem
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.15-3
- Simplify RHEL conditionals
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Apr 27 2021 Todd Zullinger <tmz@pobox.com> - 2.0.15-1
- update to asciidoctor 2.0.15
Resolves: rhbz#1954314
- remove el6 conditionals
* Mon Apr 19 2021 Todd Zullinger <tmz@pobox.com> - 2.0.14-1
- Update to asciidoctor 2.0.14
Resolves: rhbz#1950947
* Sat Apr 10 2021 Todd Zullinger <tmz@pobox.com> - 2.0.13-1
- Update to asciidoctor 2.0.13
Resolves: rhbz#1948231
* 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
* Wed Aug 19 2020 Vít Ondruch <vondruch@redhat.com> - 2.0.10-4
- Replace build time Erubis dependency by Erubi.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (asciidoctor-2.0.10.tar.gz) = 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
SHA512 (asciidoctor-2.0.26.tar.gz) = 5e42079374fb1767dd0fd6767fd1e718d2c1c673e131ef1ae401c7b17e5b413168de3b25889eda35d2021ded55855b83b78f6110729e1a7765f757b37bbf5858