From 5dbaa5a481e3a8b696c6658172c0513166acb488 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 19 May 2014 21:03:39 -0600 Subject: [PATCH] Update to Asciidoctor 0.1.5.preview.7 - Drop unused patch --- .gitignore | 1 + asciidoctor-remove-include-uri-test.patch | 22 ---------------------- rubygem-asciidoctor.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 asciidoctor-remove-include-uri-test.patch diff --git a/.gitignore b/.gitignore index 131a75b..7146dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /asciidoctor-0.1.4.gem /asciidoctor-1.5.0.preview.6.gem +/asciidoctor-1.5.0.preview.7.gem diff --git a/asciidoctor-remove-include-uri-test.patch b/asciidoctor-remove-include-uri-test.patch deleted file mode 100644 index bf76cdd..0000000 --- a/asciidoctor-remove-include-uri-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/test/reader_test.rb b/test/reader_test.rb -index abc708a..5750437 100644 ---- a/test/reader_test.rb -+++ b/test/reader_test.rb -@@ -499,17 +499,6 @@ include::fixtures/no-such-file.ad[] - end - end - -- test 'include macro can retrieve data from uri' do -- input = <<-EOS --.... --include::https://raw.github.com/asciidoctor/asciidoctor/master/LICENSE[] --.... -- EOS -- -- output = render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''} -- assert_match(/MIT/, output) -- end -- - test 'inaccessible uri referenced by include macro does not crash processor' do - input = <<-EOS - .... diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec index 41ae49a..5fcaeae 100644 --- a/rubygem-asciidoctor.spec +++ b/rubygem-asciidoctor.spec @@ -1,19 +1,16 @@ %global gem_name asciidoctor %global mandir %{_mandir}/man1 -%define pre .preview.6 +%define pre .preview.7 Summary: A fast, open source AsciiDoc implementation in Ruby Name: rubygem-%{gem_name} Version: 1.5.0 -Release: %{?pre:0.}1%{?pre}%{?dist} +Release: %{?pre:0.}2%{?pre}%{?dist} Group: Development/Languages License: MIT URL: https://github.com/asciidoctor/asciidoctor Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{pre}.gem -# Patch0: disable the test for including content from a URI -# since it does not work when the network is unavailable -Patch0: asciidoctor-remove-include-uri-test.patch %if 0%{?fc19} || 0%{?fc20} || 0%{?el7} Requires: ruby(release) BuildRequires: ruby(release) @@ -72,7 +69,6 @@ sed -i -e 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' \ # Clean up development-only file rm Rakefile sed -i "s|\"Rakefile\",||g" %{gem_name}.gemspec -#patch0 -p1 %build gem build %{gem_name}.gemspec @@ -120,6 +116,10 @@ cp -pa .%{gem_instdir}/compat/* \ %doc %{gem_docdir} %changelog +* Tue May 20 2014 Ken Dreyer - 1.5.0-0.2.preview.7 +- Update to Asciidoctor 0.1.5.preview.7 +- Drop unused patch + * Thu May 15 2014 Ken Dreyer - 1.5.0-0.1.preview.6 - Update to Asciidoctor 0.1.5.preview.6 - Use HTTPS URLs diff --git a/sources b/sources index 362303d..c948528 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88faf49377b4eab048d525572a9dac46 asciidoctor-1.5.0.preview.6.gem +d639dadd51a0913c338608215d27ef42 asciidoctor-1.5.0.preview.7.gem