From 23da97f075f22f532a9ff9ad5c8fddb8decab824 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Aug 16 2021 17:13:12 +0000 Subject: Update to sinatra 2.1.0. Resolves: rhbz#1875978 Resolves: rhbz#1970606 --- diff --git a/.gitignore b/.gitignore index eae8b5c..193a5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,2 @@ -sinatra-1.0.gem -/sinatra-1.1.2.gem -/sinatra-1.2.0.gem -/sinatra-1.2.6.gem -/sinatra-1.3.2.gem -/sinatra-1.3.4.gem -/sinatra-1.3.5.gem -/sinatra-1.4.3.gem -/sinatra-1.4.5.gem -/sinatra-1.4.6.gem -/sinatra-1.4.7.gem -/sinatra-1.4.8.gem -/sinatra-2.0.0-tests.tgz -/sinatra-2.0.0.gem -/sinatra-2.0.3-tests.tgz -/sinatra-2.0.3.gem -/sinatra-2.0.8.1-test.tar.gz -/sinatra-2.0.8.1.gem +/sinatra-*.gem +/sinatra-*-test.tar.gz diff --git a/rubygem-sinatra-2.0.8.1-Fix-failing-tests.patch b/rubygem-sinatra-2.0.8.1-Fix-failing-tests.patch deleted file mode 100644 index e844a38..0000000 --- a/rubygem-sinatra-2.0.8.1-Fix-failing-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 750aa3b0de06dad41539bdb402123b5416a3475d Mon Sep 17 00:00:00 2001 -From: Jordan Owens -Date: Tue, 10 Mar 2020 10:24:05 -0400 -Subject: [PATCH] Fix failing tests - -Rack added support for Multi-part ranges and apparently changed the -format of cookie expires timestamp format to match specs. ---- - test/static_test.rb | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/test/static_test.rb b/test/static_test.rb -index e8408b14e..1c6cb35e9 100644 ---- a/test/static_test.rb -+++ b/test/static_test.rb -@@ -152,8 +152,7 @@ def assert_valid_range(http_range, range, path, file) - end - - it 'correctly ignores syntactically invalid range requests' do -- # ...and also ignores multi-range requests, which aren't supported yet -- ["bytes=45-40", "bytes=IV-LXVI", "octets=10-20", "bytes=-", "bytes=1-2,3-4"].each do |http_range| -+ ["bytes=45-40", "bytes=IV-LXVI", "octets=10-20", "bytes=", "bytes=3-1,4-5"].each do |http_range| - request = Rack::MockRequest.new(@app) - response = request.get("/#{File.basename(__FILE__)}", 'HTTP_RANGE' => http_range) - diff --git a/rubygem-sinatra.spec b/rubygem-sinatra.spec index 6958eec..6e77acc 100644 --- a/rubygem-sinatra.spec +++ b/rubygem-sinatra.spec @@ -1,29 +1,44 @@ %global gem_name sinatra %bcond_with bootstrap +%bcond_without tilt_integration_tests Name: rubygem-%{gem_name} -Version: 2.0.8.1 -Release: 4%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Ruby-based web application framework License: MIT URL: http://sinatrarb.com/ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git clone https://github.com/sinatra/sinatra.git && cd sinatra -# git archive -v -o sinatra-2.0.8.1-test.tar.gz v2.0.8.1 test/ +# git archive -v -o sinatra-2.1.0-test.tar.gz v2.1.0 test/ Source1: %{gem_name}-%{version}-test.tar.gz -# Fix test failure due to Rack 2.2.2 incompatibility. -# https://github.com/sinatra/sinatra/pull/1605 -Patch0: rubygem-sinatra-2.0.8.1-Fix-failing-tests.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby >= 2.2.0 %if %{without bootstrap} BuildRequires: rubygem(rack-protection) = %{version} -BuildRequires: rubygem(tilt) +BuildRequires: rubygem(builder) +BuildRequires: rubygem(coffee-script) +BuildRequires: rubygem(creole) +BuildRequires: rubygem(liquid) BuildRequires: rubygem(mustermann) BuildRequires: rubygem(rack-test) BuildRequires: rubygem(minitest) > 5 +BuildRequires: rubygem(redcarpet) +# Tilt is actually required from base_test +BuildRequires: rubygem(tilt) +BuildRequires: nodejs +%if %{with tilt_integration_tests} +BuildRequires: rubygem(asciidoctor) +BuildRequires: rubygem(rdiscount) +BuildRequires: rubygem(kramdown) +BuildRequires: rubygem(nokogiri) +BuildRequires: rubygem(erubi) +BuildRequires: rubygem(haml) +BuildRequires: rubygem(slim) +BuildRequires: rubygem(sass) +%endif %endif Epoch: 1 BuildArch: noarch @@ -44,10 +59,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -b 1 -pushd %{_builddir} -%patch0 -p1 -popd - %build # Create the gem as gem install only works on a gem file gem build ../%{gem_name}-%{version}.gemspec @@ -77,6 +88,21 @@ sed -i '/active_support/ s/$/ unless Hash.method_defined?(:slice)/' test/helper. # We can't do integration test # because we don't ship sinatra-contrib including Sinatra::Runner. mv test/integration_test.rb{,.disabled} +mv test/integration_async_test.rb{,.disabled} + +%if %{without tilt_integration_tests} +mv test/asciidoctor_test.rb{,.disabled} +%endif + +# False positive: inline layouts are rendered differently than expected +#-"

THIS. IS. SPARTA

+#+# encoding: ASCII-8BIT +#+# valid: true +#+"

THIS. IS. SPARTA +#+

+sed -i '/ layouts" do/ a \ + skip' test/haml_test.rb + # TODO: Is it worth of testing all the possible template engines integration? ruby -e 'Dir.glob "./test/*_test.rb", &method(:require)' popd @@ -105,6 +131,11 @@ popd %{gem_instdir}/sinatra.gemspec %changelog +* Mon Aug 02 2021 Pavel Valena - 1:2.1.0-1 +- Update to sinatra 2.1.0. + Resolves: rhbz#1875978 + Resolves: rhbz#1970606 + * Fri Jul 23 2021 Fedora Release Engineering - 1:2.0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index a5eeee0..07b50f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sinatra-2.0.8.1-test.tar.gz) = 3217355e5a8670cf76527bedb422b91993f4abec978c9043e13febeb4c5f9593b72230316dee7fd0db2bb24d0e9f4de9c4ca97e9109161a52d77757a7d436a0f -SHA512 (sinatra-2.0.8.1.gem) = a63c8bbf468d059ce1e545c4da72208db34ef677141540b31a24a82537c15bbc020c712b9d9eb49470af45b4ce27f65ab21191ee47ebae7c45b9bbd86600ea3e +SHA512 (sinatra-2.1.0.gem) = 383c28ea949c2007af813444370f7f4d532bb970d6a69772ac0fafa64f63f1a460966750b10579929550b4e7683b5986cc62c94d98cfb824aa5fa3654e10ef56 +SHA512 (sinatra-2.1.0-test.tar.gz) = 6135c14790595c5dac8d3b866718278fd4a6417e64062fe5bccf9f97cd488d472297f4a2cea9bf3c4560d0cda00ae5396c01c922881009d15ef47fbd782321c5