From 0f4968cb17bd68540b4773fe12107877c05d0e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 8 Jul 2015 16:58:09 +0200 Subject: [PATCH] Update to Redcarpet 3.3.2. --- .gitignore | 1 + rubygem-redcarpet-libxml2-2.8-fix.patch | 127 ------------------------ rubygem-redcarpet.spec | 41 ++++---- sources | 2 +- 4 files changed, 20 insertions(+), 151 deletions(-) delete mode 100644 rubygem-redcarpet-libxml2-2.8-fix.patch diff --git a/.gitignore b/.gitignore index 01abd0f..5778047 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /redcarpet-2.1.1.gem +/redcarpet-3.3.2.gem diff --git a/rubygem-redcarpet-libxml2-2.8-fix.patch b/rubygem-redcarpet-libxml2-2.8-fix.patch deleted file mode 100644 index 5ba5296..0000000 --- a/rubygem-redcarpet-libxml2-2.8-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/test/redcarpet_test.rb b/test/redcarpet_test.rb -index 70e40ea..67bea67 100644 ---- a/test/redcarpet_test.rb -+++ b/test/redcarpet_test.rb -@@ -83,8 +83,7 @@ EOS - -

<script>BAD</script>

- --

<img src="/favicon.ico" /> -- -+

<img src="/favicon.ico" />

- EOE - - markdown = render_with(@rndr[:escape_html], source) -@@ -93,7 +92,7 @@ EOE - - def test_that_filter_html_works - markdown = render_with(@rndr[:no_html], 'Through NO ') -- html_equal "

Through NO DOUBLE NO

", markdown -+ html_equal "

Through NO DOUBLE NO

\n", markdown - end - - def test_filter_html_doesnt_break_two_space_hard_break -@@ -141,21 +140,21 @@ class MarkdownTest < Test::Unit::TestCase - - def test_that_simple_one_liner_goes_to_html - assert_respond_to @markdown, :render -- html_equal "

Hello World.

", @markdown.render("Hello World.") -+ html_equal "

Hello World.

\n", @markdown.render("Hello World.") - end - - def test_that_inline_markdown_goes_to_html - markdown = @markdown.render('_Hello World_!') -- html_equal "

Hello World!

", markdown -+ html_equal "

Hello World!

\n", markdown - end - - def test_that_inline_markdown_starts_and_ends_correctly - markdown = render_with({:no_intra_emphasis => true}, '_start _ foo_bar bar_baz _ end_ *italic* **bold** _blah_') - -- html_equal "

start _ foo_bar bar_baz _ end italic bold blah

", markdown -+ html_equal "

start _ foo_bar bar_baz _ end italic bold blah

\n", markdown - - markdown = @markdown.render("Run 'rake radiant:extensions:rbac_base:migrate'") -- html_equal "

Run 'rake radiant:extensions:rbac_base:migrate'

", markdown -+ html_equal "

Run 'rake radiant:extensions:rbac_base:migrate'

\n", markdown - end - - def test_that_urls_are_not_doubly_escaped -@@ -249,7 +248,7 @@ class MarkdownTest < Test::Unit::TestCase - - def test_whitespace_after_urls - rd = render_with({:autolink => true}, "Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)") -- exp = %{

Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)

} -+ exp = %{

Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)

\n} - html_equal exp, rd - end - -@@ -269,7 +268,7 @@ class MarkdownTest < Test::Unit::TestCase - end - - def test_infinite_loop_in_header -- html_equal @markdown.render(<<-header), "

Body

" -+ html_equal @markdown.render(<<-header), "

Body

\n" - ###### - #Body# - ###### -@@ -313,7 +312,7 @@ fenced - - def test_that_headers_are_linkable - markdown = @markdown.render('### Hello [GitHub](http://github.com)') -- html_equal "

Hello GitHub

", markdown -+ html_equal "

Hello GitHub

\n", markdown - end - - def test_autolinking_with_ent_chars -@@ -338,7 +337,7 @@ class CustomRenderTest < Test::Unit::TestCase - - def test_simple_overload - md = Redcarpet::Markdown.new(SimpleRender) -- html_equal "

This is just a test

", -+ html_equal "

This is just a test

\n", - md.render("This is *just* a test") - end - -@@ -358,36 +357,36 @@ end - class RedcarpetCompatTest < Test::Unit::TestCase - def test_simple_compat_api - html = RedcarpetCompat.new("This is_just_a test").to_html -- html_equal "

This isjusta test

", html -+ html_equal "

This isjusta test

\n", html - end - - def test_compat_api_enables_extensions - html = RedcarpetCompat.new("This is_just_a test", :no_intra_emphasis).to_html -- html_equal "

This is_just_a test

", html -+ html_equal "

This is_just_a test

\n", html - end - - def test_compat_api_knows_fenced_code_extension - text = "```ruby\nx = 'foo'\n```" - html = RedcarpetCompat.new(text, :fenced_code).to_html -- html_equal "
x = 'foo'\n
", html -+ html_equal "
x = 'foo'\n
\n", html - end - - def test_compat_api_ignores_gh_blockcode_extension - text = "```ruby\nx = 'foo'\n```" - html = RedcarpetCompat.new(text, :fenced_code, :gh_blockcode).to_html -- html_equal "
x = 'foo'\n
", html -+ html_equal "
x = 'foo'\n
\n", html - end - - def test_compat_api_knows_no_intraemphasis_extension - html = RedcarpetCompat.new("This is_just_a test", :no_intraemphasis).to_html -- html_equal "

This is_just_a test

", html -+ html_equal "

This is_just_a test

\n", html - end - - def test_translate_outdated_extensions - # these extensions are no longer used - exts = [:gh_blockcode, :no_tables, :smart, :strict] - html = RedcarpetCompat.new('"TEST"', *exts).to_html -- html_equal "

"TEST"

", html -+ html_equal "

"TEST"

\n", html - end - end diff --git a/rubygem-redcarpet.spec b/rubygem-redcarpet.spec index 577439f..0b34c08 100644 --- a/rubygem-redcarpet.spec +++ b/rubygem-redcarpet.spec @@ -1,26 +1,21 @@ %global gem_name redcarpet -Summary: A fast, safe and extensible Markdown to (X)HTML parser Name: rubygem-%{gem_name} -Version: 2.1.1 -Release: 13%{?dist} +Version: 3.3.2 +Release: 1%{?dist} +Summary: A fast, safe and extensible Markdown to (X)HTML parser Group: Development/Languages -License: ISC -URL: http://github.com/tanoku/redcarpet -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Patch0: rubygem-redcarpet-libxml2-2.8-fix.patch +# https://github.com/vmg/redcarpet/issues/502 +License: MIT and ISC +URL: http://github.com/vmg/redcarpet +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) -BuildRequires: rubygem(rake) -BuildRequires: rubygem(nokogiri) -BuildRequires: rubygem(rdoc) - - - %description -A fast, safe and extensible Markdown to (X)HTML parser +A fast, safe and extensible Markdown to (X)HTML parser. %package doc @@ -30,15 +25,14 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc -Documentation for %{name} +Documentation for %{name}. %prep %setup -q -c -T %gem_install -n %{SOURCE0} -pushd .%{gem_instdir} -%patch0 -p1 -popd +# https://github.com/vmg/redcarpet/pull/503 +chmod a-x .%{gem_instdir}/ext/redcarpet/html.c %build @@ -56,12 +50,9 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri} # Prevent dangling symlink in -debuginfo. rm -rf %{buildroot}%{gem_instdir}/ext -# Fix permissions -chmod 644 ./%{gem_instdir}/COPYING - %check pushd .%{gem_instdir} -ruby -Ilib:$(dirs +1)%{gem_extdir_mri} test/redcarpet_test.rb +RUBYOPT=-Ilib:$(dirs +1)%{gem_extdir_mri}:test ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' popd %files @@ -72,10 +63,11 @@ popd %{gem_extdir_mri} %exclude %{gem_cache} %{gem_spec} -%doc %{gem_instdir}/COPYING +%license %{gem_instdir}/COPYING %doc %{gem_instdir}/README.markdown %files doc +%{gem_instdir}/Gemfile %{gem_instdir}/Rakefile %{gem_instdir}/test %{gem_instdir}/%{gem_name}.gemspec @@ -83,6 +75,9 @@ popd %changelog +* Wed Jul 08 2015 Vít Ondruch - 3.3.2-1 +- Update to Redcarpet 3.3.2. + * Thu Jun 18 2015 Fedora Release Engineering - 2.1.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 40f061c..98561bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fb22c5a84d5068362d78c95505dd307 redcarpet-2.1.1.gem +048b42d499b37c6dd02f2e438758f9b0 redcarpet-3.3.2.gem