From 214e18222fa738744611d1c3127212bf5f157f37 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Thu, 4 Feb 2021 15:48:24 +0100 Subject: [PATCH] Use explicit keyword declaration in stallion.rb. resolves rhbz#1924714 --- ...uest-1.1.7-explicit-keyword-argument.patch | 19 +++++++++++++++++++ rubygem-em-http-request.spec | 12 +++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 rubygem-em-http-request-1.1.7-explicit-keyword-argument.patch diff --git a/rubygem-em-http-request-1.1.7-explicit-keyword-argument.patch b/rubygem-em-http-request-1.1.7-explicit-keyword-argument.patch new file mode 100644 index 0000000..b5246bd --- /dev/null +++ b/rubygem-em-http-request-1.1.7-explicit-keyword-argument.patch @@ -0,0 +1,19 @@ +diff --git a/spec/stallion.rb b/spec/stallion.rb +index b7e1981..54d6c80 100644 +--- a/spec/stallion.rb ++++ b/spec/stallion.rb +@@ -53,7 +53,13 @@ module Stallion + + def self.run(options = {}) + options = {:Host => "127.0.0.1", :Port => 8090}.merge(options) +- Rack::Handler::Mongrel.run(Rack::Lint.new(self), options) ++ ++ ruby_version = RUBY_VERSION.split('.').map(&:to_i) ++ if ruby_version[0] >= 3 ++ Rack::Handler::Mongrel.run(Rack::Lint.new(self), **options) ++ else ++ Rack::Handler::Mongrel.run(Rack::Lint.new(self), options) ++ end + end + + def self.call(env) diff --git a/rubygem-em-http-request.spec b/rubygem-em-http-request.spec index 3f2f5db..ce4bf59 100644 --- a/rubygem-em-http-request.spec +++ b/rubygem-em-http-request.spec @@ -3,11 +3,14 @@ Name: rubygem-%{gem_name} Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: EventMachine based, async HTTP Request client License: MIT URL: http://github.com/igrigorik/em-http-request Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# Since Ruby 3.0 keyword arguments need to be explicitly declared +# PR: https://github.com/igrigorik/em-http-request/pull/344 +Patch0: %{name}-%{version}-explicit-keyword-argument.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -18,6 +21,7 @@ BuildRequires: rubygem(addressable) BuildRequires: rubygem(cookiejar) BuildRequires: rubygem(http_parser.rb) BuildRequires: rubygem(rack) +BuildRequires: rubygem(webrick) BuildRequires: %{_bindir}/ping BuildRequires: rubygem(rspec) @@ -38,6 +42,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} +%patch0 -p1 + %build # Create the gem as gem install only works on a gem file gem build ../%{gem_name}-%{version}.gemspec @@ -96,6 +102,10 @@ popd %{gem_instdir}/spec %changelog +* Thu Feb 4 2021 Jaroslav Prokop - 1.1.7-3 +- Use explicit keyword declaration in stallion.rb. + resolves rhbz#1924714 + * Wed Jan 27 2021 Fedora Release Engineering - 1.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild