diff --git a/.gitignore b/.gitignore index 1d55ea7..c73c180 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/em-http-request-1.1.5.gem +/em-http-request-*.gem diff --git a/rubygem-em-http-request.spec b/rubygem-em-http-request.spec index f39e408..b673aec 100644 --- a/rubygem-em-http-request.spec +++ b/rubygem-em-http-request.spec @@ -2,8 +2,8 @@ %global gem_name em-http-request Name: rubygem-%{gem_name} -Version: 1.1.5 -Release: 9%{?dist} +Version: 1.1.7 +Release: 1%{?dist} Summary: EventMachine based, async HTTP Request client License: MIT URL: http://github.com/igrigorik/em-http-request @@ -15,7 +15,7 @@ BuildRequires: rubygem(eventmachine) BuildRequires: rubygem(multi_json) BuildRequires: rubygem(em-socksify) BuildRequires: rubygem(addressable) -BUildRequires: rubygem(cookiejar) +BuildRequires: rubygem(cookiejar) BuildRequires: rubygem(http_parser.rb) BuildRequires: rubygem(rack) BuildRequires: %{_bindir}/ping @@ -36,15 +36,11 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{gem_name}-%{version} - -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} %build # Create the gem as gem install only works on a gem file -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir # by default, so that we can move it into the buildroot in %%install @@ -63,20 +59,21 @@ pushd .%{gem_instdir} sed -i "/require 'bundler\/setup'/ s/^/#/" spec/helper.rb # Mongrel is deprecated so we are using WEBrick server sed -i 's/Mongrel/WEBrick/' spec/stallion.rb +# Missing require on pathname in client spec +sed -i "/^require 'helper'/i require 'pathname'" spec/client_spec.rb -# Failing tests +# Fails, not quite sure why :/ sed -i '/it "should report error if connection was closed by server on client keepalive requests" do/ ,/^ end$/ s/^/#/' spec/client_spec.rb -# this one seems to fail with WEBrick since Thin server fixes it at the expense of other fails and segfault. + +# These tests fail on WEBrick but on Puma the tests are passing. sed -i '/it "should set content-length to 0 on posts with empty bodies" do/ ,/^ end$/ s/^/#/' spec/client_spec.rb -# Fails on WEBrick but on Thin the test is passing sed -i '/it "should fail GET on invalid host" do/ ,/^ end$/ s/^/#/' spec/dns_spec.rb - -# Disable segfaulting tests. +sed -i '/it "should keep default https port in redirect url that include it"/ ,/^ end$/ s/^/#/' spec/redirect_spec.rb +sed -i '/it "should keep default http port in redirect url that include it"/ ,/^ end$/ s/^/#/' spec/redirect_spec.rb +# Got a different message than expected with WEBrick, works on Puma sed -i '/it "should fail gracefully on an invalid host in Location header" do/ ,/^ end$/ s/^/#/' spec/dns_spec.rb -sed -i '/it "should keep default http port in redirect url that include it" do/ ,/^ end$/ s/^/#/' spec/redirect_spec.rb -sed -i '/it "should keep default https port in redirect url that include it" do/ ,/^ end$/ s/^/#/' spec/redirect_spec.rb -# One of the tests is expecting UTF-8 encoding enviroment +# One of tests expects UTF-8 encoding. LANG=C.UTF-8 rspec spec -f d popd @@ -84,7 +81,6 @@ popd %dir %{gem_instdir} %exclude %{gem_instdir}/.* %{gem_instdir}/benchmarks -%exclude %{gem_instdir}/em-http-request.gemspec %{gem_libdir} %exclude %{gem_cache} %{gem_spec} @@ -95,10 +91,15 @@ popd %{gem_instdir}/Gemfile %doc %{gem_instdir}/README.md %{gem_instdir}/Rakefile +%{gem_instdir}/em-http-request.gemspec %{gem_instdir}/examples %{gem_instdir}/spec %changelog +* Mon Nov 30 2020 Jaroslav Prokop - 1.1.7-1 +- Update to version 1.1.7 + resolves rhbz#1842726 + * Wed Jul 29 2020 Fedora Release Engineering - 1.1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b4e3910..a9da43e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (em-http-request-1.1.5.gem) = cb37582291eb282b8c9386ae1512222856b48a482f1c72da80c40f1d5d6c9a61af949da7e6b7d77d6c45ed9547be2041e147c973676ab6ffc1ea3bfa7ddb35bc +SHA512 (em-http-request-1.1.7.gem) = 3a20f29131188d7d0815d295bb5d958a65640033b5682adf0e35a91410e8bd9bf148c8ca39d97a81c0a90be58ff68cdc93d60e8ddd957bfc49e2bc7166c29f27