[rubygem-typhoeus] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
Vít Ondruch
vondruch at fedoraproject.org
Fri Mar 8 18:56:15 UTC 2013
commit b44f6ae9fb842f0eddb6f7ea8c3261e23ebfb4df
Author: Vít Ondruch <vondruch at redhat.com>
Date: Fri Mar 8 13:33:51 2013 +0100
Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
...m-typhoeus-0.3.3-fix-spec-to-newer-syntax.patch | 35 ++++++++++++++++++++
rubygem-typhoeus.spec | 28 ++++++++-------
2 files changed, 50 insertions(+), 13 deletions(-)
---
diff --git a/rubygem-typhoeus-0.3.3-fix-spec-to-newer-syntax.patch b/rubygem-typhoeus-0.3.3-fix-spec-to-newer-syntax.patch
new file mode 100644
index 0000000..aa3ca47
--- /dev/null
+++ b/rubygem-typhoeus-0.3.3-fix-spec-to-newer-syntax.patch
@@ -0,0 +1,35 @@
+diff --git a/spec/typhoeus/hydra_spec.rb b/spec/typhoeus/hydra_spec.rb
+index d6214f6..8164cdf 100644
+--- a/spec/typhoeus/hydra_spec.rb
++++ b/spec/typhoeus/hydra_spec.rb
+@@ -371,11 +371,10 @@ describe Typhoeus::Hydra::Stubbing do
+ @stub_target.stub(:get, "http://localhost:3000/foo",
+ :headers => { 'user-agent' => 'test'}).
+ and_return(@response)
+-
+ @hydra.queue(@request)
+ @hydra.run
+ @on_complete_handler_called.should be_true
+- @response.request.should == @request
++ @response.request.should eq(@request)
+ end
+
+ it "should provide a stubs accessor" do
+@@ -395,7 +394,7 @@ describe Typhoeus::Hydra::Stubbing do
+ @hydra.queue(@request)
+ @hydra.run
+ @on_complete_handler_called.should be_true
+- @response.request.should == @request
++ @response.request.should eq(@request)
+ end
+
+ it "stubs requests to URIs matching a pattern" do
+@@ -405,7 +404,7 @@ describe Typhoeus::Hydra::Stubbing do
+ @hydra.queue(@request)
+ @hydra.run
+ @on_complete_handler_called.should be_true
+- @response.request.should == @request
++ @response.request.should eq(@request)
+ end
+
+ it "can clear stubs" do
diff --git a/rubygem-typhoeus.spec b/rubygem-typhoeus.spec
index d5ddba5..302d9a0 100644
--- a/rubygem-typhoeus.spec
+++ b/rubygem-typhoeus.spec
@@ -1,22 +1,23 @@
%global gem_name typhoeus
-%global rubyabi 1.9.1
Summary: A library for interacting with web services at blinding speed
Name: rubygem-%{gem_name}
Version: 0.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/pauldix/typhoeus
Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+# Fixes "wrong number of arguments (1 for 0)" due to newer RSpec. Upstream
+# has much newer version, so no need to upstream this patch.
+Patch0: rubygem-typhoeus-0.3.3-fix-spec-to-newer-syntax.patch
Requires: ruby(rubygems)
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
Requires: rubygem(mime-types)
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
BuildRequires: rubygems-devel
-# Use rspec-core until rspec are not migrated to RSpec 2.x
-BuildRequires: rubygem(rspec-core)
+BuildRequires: rubygem(rspec)
BuildRequires: rubygem(json)
BuildRequires: rubygem(mime-types)
BuildRequires: rubygem(sinatra)
@@ -39,13 +40,11 @@ Documentation for %{name}
%prep
%setup -q -c -T
-mkdir -p ./%{gem_dir}
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install \
- --local \
- --install-dir ./%{gem_dir} \
- -V --force --rdoc \
- %{SOURCE0}
+%gem_install -n %{SOURCE0}
+
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
%build
@@ -90,6 +89,9 @@ popd
%doc %{gem_docdir}
%changelog
+* Fri Mar 08 2013 Vít Ondruch <vondruch at redhat.com> - 0.3.3-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list