#2 Update to Asciidoctor 2.0.0
Opened 6 months ago by tmz. Modified 2 months ago
rpms/ tmz/rubygem-asciidoctor master  into  master

file modified
+1 -1

@@ -1,5 +1,5 @@ 

- /*.gem

  /*.rpm

+ /*.tar.gz

  /.build*.log

  /asciidoctor-*/

  /results_*/

file modified
+43 -17

@@ -2,14 +2,15 @@ 

  %global mandir %{_mandir}/man1

  

  %define pre %nil

+ %global gittag v%{version}%{pre}

  

  Summary: A fast, open source AsciiDoc implementation in Ruby

  Name: rubygem-%{gem_name}

- Version: 1.5.8

+ Version: 2.0.10

  Release: 1%{?dist}

  License: MIT

- URL: https://github.com/asciidoctor/asciidoctor

- Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{pre}.gem

+ URL: https://asciidoctor.org

+ Source0: https://github.com/asciidoctor/asciidoctor/archive/%{gittag}/%{gem_name}-%{version}%{pre}.tar.gz

  %if 0%{?el7}

  Requires: ruby(release)

  BuildRequires: ruby(release)

@@ -30,6 +31,7 @@ 

  BuildRequires: rubygem(haml)

  BuildRequires: rubygem(minitest)

  BuildRequires: rubygem(nokogiri)

+ BuildRequires: rubygem(rouge)

  BuildRequires: rubygem(slim)

  BuildRequires: rubygem(tilt)

  %endif

@@ -62,13 +64,13 @@ 

  Documentation for %{name}

  

  %prep

- gem unpack -V %{SOURCE0}

- %setup -q -D -T -n %{gem_name}-%{version}%{pre}

- gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec

+ %autosetup -n %{gem_name}-%{version}%{pre} -p1

+ 

+ # Include tests in the gem, they're disabled by default

+ 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} bin/%{gem_name}-safe

+ sed -i -e 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' bin/%{gem_name}

  

  %build

  gem build %{gem_name}.gemspec

@@ -80,12 +82,6 @@ 

  %if 0%{?el6} || 0%{?el7}

  # Asciidoctor tests require Minitest 5, so we can't run them on EPEL

  %else

- sed -i "/test 'should convert asciimath macro content to MathML when asciimath gem is available' do/a \\

-         skip('asciimath gem is not available on Fedora')" test/substitutions_test.rb

- 

- sed -i "/should render asciimath block in textobject of equation in DocBook backend/a \\

-       skip('asciimath gem is not available on Fedora')" test/blocks_test.rb

- 

  LANG=C.UTF-8 ruby -I"lib:test" -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'

  %endif

  popd

@@ -111,11 +107,8 @@ 

  %exclude %{gem_instdir}/man

  %exclude %{gem_instdir}/test

  %exclude %{gem_instdir}/features

- %exclude %{gem_instdir}/Gemfile

- %exclude %{gem_instdir}/Rakefile

  %license %{gem_instdir}/LICENSE

  %doc %{gem_instdir}/CHANGELOG.adoc

- %doc %{gem_instdir}/CONTRIBUTING.adoc

  %doc %{gem_instdir}/README.*

  %lang(de) %doc %{gem_instdir}/README-de.*

  %lang(fr) %doc %{gem_instdir}/README-fr.*

@@ -132,6 +125,39 @@ 

  %doc %{gem_docdir}

  

  %changelog

+ * Sat Jun 29 2019 Todd Zullinger <tmz@pobox.com> - 2.0.10-1

+ - Update to Asciidoctor 2.0.10

+ 

+ * Tue Apr 30 2019 Todd Zullinger <tmz@pobox.com> - 2.0.9-1

+ - Update to Asciidoctor 2.0.9

+ 

+ * Mon Apr 22 2019 Todd Zullinger <tmz@pobox.com> - 2.0.8-1

+ - Update to Asciidoctor 2.0.8

+ 

+ * Sun Apr 14 2019 Todd Zullinger <tmz@pobox.com> - 2.0.7-1

+ - Update to Asciidoctor 2.0.7

+ 

+ * Thu Apr 04 2019 Todd Zullinger <tmz@pobox.com> - 2.0.6-1

+ - Update to Asciidoctor 2.0.6

+ 

+ * Mon Apr 01 2019 Todd Zullinger <tmz@pobox.com> - 2.0.5-1

+ - Update to Asciidoctor 2.0.5

+ 

+ * Sun Mar 31 2019 Todd Zullinger <tmz@pobox.com> - 2.0.4-1

+ - Update to Asciidoctor 2.0.4

+ 

+ * Thu Mar 28 2019 Todd Zullinger <tmz@pobox.com> - 2.0.3-1

+ - Update to Asciidoctor 2.0.3

+ 

+ * Tue Mar 26 2019 Todd Zullinger <tmz@pobox.com> - 2.0.2-1

+ - Update to Asciidoctor 2.0.2

+ 

+ * Mon Mar 25 2019 Todd Zullinger <tmz@pobox.com> - 2.0.1-1

+ - Update to Asciidoctor 2.0.1

+ 

+ * Fri Mar 22 2019 Todd Zullinger <tmz@pobox.com> - 2.0.0-1

+ - Update to Asciidoctor 2.0.0

+ 

  * Tue Mar 19 2019 Todd Zullinger <tmz@pobox.com> - 1.5.8-1

  - Update to Asciidoctor 1.5.8 (resolves CVE-2018-18385)

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (asciidoctor-1.5.8.gem) = 34ff0df98ff9ebb2d3640629870cd848cf2f4b617564a42e7b30b6cf60c01d1188b4cc695af49550e054c9e833accc1ed5d622b4952ece3da99c8ed98af769ac

+ SHA512 (asciidoctor-2.0.10.tar.gz) = 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe

The distributed gem file no longer contains the tests, so we now
download a tarball via the git tag. While adjusting Source0, update the
URL to point to the main asciidoc home page.

While I have commit access, this is a large update and requires some changes to the handling of Sources. I'd rather get some review before pushing it. I ran scratch builds for fedora 28-31 and el6/el7 (though I certainly don't expect we'd ever want to push updates to all of those releases). The builds fail on f28 due to an older version of rouge which lacks the disable_debug method. It also fails on el6 because ruby is ancient there. All others pass, but the tests aren't run on el7 which might be the only reason the build succeeds there.

I did also test that builds setting the %{pre} macro still work. That will hopefully make life easier for someone testing release candidates down the road.

I haven't tested the packages which build require asciidoctor yet, but I have attempted to build the git documentation with 2.0.0. It fails due to the removal of the docbook45 backend[1].

I'll look at the packages already using asciidoctor sometime soon, but let's hold off on merging this until we've got an idea of what changes it means for the packages currently using it.

My main use case is with the git documentation, both manpage and html output.

[1] I know asciidoctor can directly output manpages, skipping the need for docbook and xmlto in the middle. However, for the initial steps with git, we'd like to keep the toolchain as similar as possible between asciidoc and asciidoctor. The end goal would be to make asciidoctor the default option and then we can drop asciidoc support and make use of asciidoctor-only options. That's a slow process though.

10 new commits added

  • Update to Asciidoctor 2.0.10
  • Update to Asciidoctor 2.0.9
  • Update to Asciidoctor 2.0.8
  • Update to Asciidoctor 2.0.7
  • Update to Asciidoctor 2.0.6
  • Update to Asciidoctor 2.0.5
  • Update to Asciidoctor 2.0.4
  • Update to Asciidoctor 2.0.3
  • Update to Asciidoctor 2.0.2
  • Update to Asciidoctor 2.0.1
2 months ago

Hi all,

In light of the recent "fails to build from source" bug in rawhide for 1.5.x, should we revisit this update and see if we can push it to rawhide soon? I've kept building each update as I see them, but I have not had time to more thoroughly test each of them against the various tools which use asciidoctor in their build processes.

The latest 2.0.10 scratch build is here.