From deb557b413abdb756d742b1417b886960a543bd8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sep 22 2019 14:40:43 +0000 Subject: Update to Asciidoctor 2.0.10 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 --- diff --git a/.gitignore b/.gitignore index 57d3230..9902873 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/*.gem /*.rpm +/*.tar.gz /.build*.log /asciidoctor-*/ /results_*/ diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec index 028324d..cdd3cff 100644 --- a/rubygem-asciidoctor.spec +++ b/rubygem-asciidoctor.spec @@ -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(erubis) BuildRequires: rubygem(haml) BuildRequires: rubygem(minitest) BuildRequires: rubygem(nokogiri) +BuildRequires: rubygem(rouge) BuildRequires: rubygem(slim) BuildRequires: rubygem(tilt) %endif @@ -62,13 +64,13 @@ BuildArch: noarch 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 @@ pushd .%{gem_instdir} %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 @@ cp -a .%{gem_instdir}/man/*.1 \ %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 @@ cp -a .%{gem_instdir}/man/*.1 \ %doc %{gem_docdir} %changelog +* Sun Sep 22 2019 Todd Zullinger - 2.0.10-1 +- Update to Asciidoctor 2.0.10 + * Fri Jul 26 2019 Fedora Release Engineering - 1.5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7927eb8..a3731a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (asciidoctor-1.5.8.gem) = 34ff0df98ff9ebb2d3640629870cd848cf2f4b617564a42e7b30b6cf60c01d1188b4cc695af49550e054c9e833accc1ed5d622b4952ece3da99c8ed98af769ac +SHA512 (asciidoctor-2.0.10.tar.gz) = 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe