[rubygem-sinatra] Update to version 1.3.5.

Bohuslav Kabrda bkabrda at fedoraproject.org
Thu Mar 7 14:42:45 UTC 2013


commit bfa9255223be80ece07bcc80e4795506d1c05a2d
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Thu Mar 7 15:42:35 2013 +0100

    Update to version 1.3.5.
    
    - Run tests again.

 rubygem-sinatra-1.3.5-fix-tests-with-rdoc-4.patch |   26 +++++++++++++++++++++
 rubygem-sinatra.spec                              |   20 ++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/rubygem-sinatra-1.3.5-fix-tests-with-rdoc-4.patch b/rubygem-sinatra-1.3.5-fix-tests-with-rdoc-4.patch
new file mode 100644
index 0000000..cd60a07
--- /dev/null
+++ b/rubygem-sinatra-1.3.5-fix-tests-with-rdoc-4.patch
@@ -0,0 +1,26 @@
+commit 11f90fd2957cf5a2b3d5c3421f28b910e58b3fd9
+Author: Bohuslav Kabrda <bkabrda at redhat.com>
+Date:   Thu Mar 7 15:36:38 2013 +0100
+
+    Fix test failures with RDoc 4 broken by commit rdoc/rdoc at 7f0033d
+
+diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb
+index 7d22a1c..3fa7872 100644
+--- a/test/rdoc_test.rb
++++ b/test/rdoc_test.rb
+@@ -16,13 +16,13 @@ class RdocTest < Test::Unit::TestCase
+   it 'renders inline rdoc strings' do
+     rdoc_app { rdoc '= Hiya' }
+     assert ok?
+-    assert_body /<h1[^>]*>Hiya<\/h1>/
++    assert_body /<h1[^>]*>Hiya(<span><a href=\"#label-Hiya\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+   end
+ 
+   it 'renders .rdoc files in views path' do
+     rdoc_app { rdoc :hello }
+     assert ok?
+-    assert_body /<h1[^>]*>Hello From RDoc<\/h1>/
++    assert_body /<h1[^>]*>Hello From RDoc(<span><a href=\"#label-Hello\+From\+RDoc\">&para;<\/a> <a href=\"#documentation\">&uarr;<\/a><\/span>)?<\/h1>/
+   end
+ 
+   it "raises error if template not found" do
diff --git a/rubygem-sinatra.spec b/rubygem-sinatra.spec
index fe90c19..5774112 100644
--- a/rubygem-sinatra.spec
+++ b/rubygem-sinatra.spec
@@ -5,23 +5,25 @@
 Summary:        Ruby-based web application framework
 Name:           rubygem-%{gem_name}
 Version:        1.3.5
-Release:        5%{?dist}
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://sinatra.rubyforge.org
 Source0:        http://rubygems.org/downloads/%{gem_name}-%{version}.gem
+# https://github.com/sinatra/sinatra/pull/660
+Patch0:         %{name}-1.3.5-fix-tests-with-rdoc-4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ruby(release)
 Requires:       ruby(rubygems)
-Requires:       rubygem(rack) >= 1.3.0
+Requires:       rubygem(rack) >= 1.4.0
 Requires:       rubygem(rack-protection) >= 1.3.0
-Requires:       rubygem(tilt)
+Requires:       rubygem(tilt) >= 1.3.3
 BuildRequires:  rubygems-devel
 %if 0%{bootstrap} < 1
-BuildRequires:  rubygem(rack) >= 1.3.0
+BuildRequires:  rubygem(rack) >= 1.4.0
 BuildRequires:  rubygem(rack-test)
 BuildRequires:  rubygem(rack-protection) >= 1.3.0
-BuildRequires:  rubygem(tilt)
+BuildRequires:  rubygem(tilt) >= 1.3.3
 BuildRequires:  rubygem(minitest)
 %endif
 BuildArch:      noarch
@@ -47,6 +49,10 @@ This package contains documentation for %{name}.
 %{__mkdir_p} .%{gem_dir}
 %gem_install -n %{SOURCE0}
 
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
 %build
 
 %check
@@ -82,7 +88,7 @@ rm %{buildroot}/%gem_instdir/.yardopts # Remove YARD configuration
 %{gem_instdir}/Gemfile
 
 %changelog
-* Thu Mar 07 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1:1.3.4-5
+* Thu Mar 07 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1:1.3.5-1
 - Update to version 1.3.5.
 - Run tests again.
 
@@ -151,7 +157,7 @@ rm %{buildroot}/%gem_instdir/.yardopts # Remove YARD configuration
 - New argument to specify the address to bind to
 - Speed improvement in rendering templates
 
-* Thu Feb 15 2010 Michal Fojtik <mfojtik at redhat.com> - 0.9.4-2
+* Mon Feb 15 2010 Michal Fojtik <mfojtik at redhat.com> - 0.9.4-2
 - Downgrade-Release
 
 * Thu Jan 07 2010 Michal Fojtik <mfojtik at redhat.com> - 0.10.1-1


More information about the scm-commits mailing list