#3 Update to Asciidoctor 2.0.10
Closed a month ago by tmz. Opened 2 months ago by snecker.
rpms/ snecker/rubygem-asciidoctor f31  into  f31

file modified
+1 -1

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

- /*.gem

  /*.rpm

+ /*.tar.gz

  /.build*.log

  /asciidoctor-*/

  /results_*/

file modified
+14 -18

@@ -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

- Release: 2%{?dist}

+ 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,9 @@ 

  %doc %{gem_docdir}

  

  %changelog

+ * Sun Sep 22 2019 Todd Zullinger <tmz@pobox.com> - 2.0.10-1

+ - Update to Asciidoctor 2.0.10

+ 

  * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

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.

Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.10

Pushing a major version update like this isn't appropriate for F31, which is well past the change freeze.

@tmz understood however this does mean we are shipping a version in F31 which is 4 years old.

Yeah, that's definitely unfortunate (it was also true of f30, shipping with 1.5.6.1 from 2017).

We simply missed the window to push this to f31 while it was under development.

Hopefully we'll be able to better track upstream for the future. I think that's particularly true now that they're following semantic versioning guidelines which should make it easier for us to know which releases are okay to push to stable releases and which need to wait for the next Fedora release.

I'm planning to move the git docs build from asciidoc, which is why I'm interested in keeping asciidoctor relatively current.

Pull-Request has been closed by tmz

a month ago