[rubygem-eventmachine] Rebuilt for Ruby 1.9.3.
Vít Ondruch
vondruch at fedoraproject.org
Thu Jan 19 13:19:40 UTC 2012
commit 1d93b00d7773d00666ae4b117d17495e9fb89b62
Author: Vít Ondruch <vondruch at redhat.com>
Date: Thu Jan 19 14:19:33 2012 +0100
Rebuilt for Ruby 1.9.3.
...ine-0.12.10-makes-HTTPS-client-tests-pass.patch | 29 ++++++++
rubygem-eventmachine.spec | 77 +++++++++++---------
2 files changed, 71 insertions(+), 35 deletions(-)
---
diff --git a/rubygem-eventmachine-0.12.10-makes-HTTPS-client-tests-pass.patch b/rubygem-eventmachine-0.12.10-makes-HTTPS-client-tests-pass.patch
new file mode 100644
index 0000000..cf4c9af
--- /dev/null
+++ b/rubygem-eventmachine-0.12.10-makes-HTTPS-client-tests-pass.patch
@@ -0,0 +1,29 @@
+From 2c083af3d06d333db31dcc1bbe535b10285a8d1e Mon Sep 17 00:00:00 2001
+From: "Michael S. Klishin" <michael at novemberain.com>
+Date: Sun, 23 May 2010 21:09:03 +0400
+Subject: [PATCH] Makes HTTPS client tests pass
+
+https://www.amazon.com now redirects to http version. Switching site
+is enough to make the test pass.
+
+Signed-off-by: Aman Gupta <aman at tmm1.net>
+---
+ tests/test_httpclient2.rb | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/test_httpclient2.rb b/tests/test_httpclient2.rb
+index ef72e7c..4705e42 100644
+--- a/tests/test_httpclient2.rb
++++ b/tests/test_httpclient2.rb
+@@ -141,7 +141,7 @@ class TestHttpClient2 < Test::Unit::TestCase
+ def test_https_get
+ d = nil
+ EM.run {
+- http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true
++ http = EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true
+ d = http.get "/"
+ d.callback {
+ EM.stop
+--
+1.7.7.5
+
diff --git a/rubygem-eventmachine.spec b/rubygem-eventmachine.spec
index d5376e3..3504883 100644
--- a/rubygem-eventmachine.spec
+++ b/rubygem-eventmachine.spec
@@ -1,20 +1,20 @@
-%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname eventmachine
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name eventmachine
Summary: Ruby/EventMachine library
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
Version: 0.12.10
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: Development/Languages
License: GPLv2 or Ruby
URL: http://rubyeventmachine.com
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Requires: rubygems
-Requires: ruby(abi) = 1.8
-Provides: rubygem(%{gemname}) = %{version}
-BuildRequires: rubygems, ruby-devel, openssl-devel, rubygem(rake), net-tools
+Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+# Fixed upstream
+# https://github.com/eventmachine/eventmachine/commit/2c083af3d06d333db31dcc1bbe535b10285a8d1e
+Patch0: rubygem-eventmachine-0.12.10-makes-HTTPS-client-tests-pass.patch
+Requires: ruby(rubygems)
+Requires: ruby(abi) = 1.9.1
+Provides: rubygem(%{gem_name}) = %{version}
+BuildRequires: rubygems-devel, ruby-devel, openssl-devel, rubygem(rake), net-tools
%description
EventMachine implements a fast, single-threaded engine for arbitrary network
@@ -41,54 +41,61 @@ This package contains documentation for %{name}.
%prep
%setup -q -T -c
-
-%build
-mkdir -p .%{gemdir}
+mkdir -p .%{gem_dir}
gem install -V \
--local \
- --install-dir $(pwd)/%{gemdir} \
+ --install-dir $(pwd)/%{gem_dir} \
--force --rdoc \
%{SOURCE0}
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
+%build
+
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-mkdir -p %{buildroot}%{ruby_sitearch}
-cp -a ./%{gemdir}/* %{buildroot}/%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+mkdir -p %{buildroot}%{ruby_vendorarchdir}
+cp -a ./%{gem_dir}/* %{buildroot}/%{gem_dir}/
-rm -rf %{buildroot}%{geminstdir}/{ext,java,.gitignore,setup.rb,%{gemname}.gemspec}
-mv %{buildroot}%{geminstdir}/lib/*.so %{buildroot}%{ruby_sitearch}
+rm -rf %{buildroot}%{gem_instdir}/{ext,java,.gitignore,setup.rb,%{gem_name}.gemspec}
+mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{ruby_vendorarchdir}
%clean
rm -rf %{buildroot}
%check
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
# no kqueue support on Linux
rm -f tests/test_process_watch.rb
rake test || :
%files
%defattr(-, root, root, -)
-%doc %{geminstdir}/README
-%dir %{geminstdir}/
-%{geminstdir}/lib
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%{ruby_sitearch}/rubyeventmachine.so
-%{ruby_sitearch}/fastfilereaderext.so
+%doc %{gem_instdir}/README
+%dir %{gem_instdir}/
+%{gem_libdir}
+%{gem_cache}
+%{gem_spec}
+%{ruby_vendorarchdir}/rubyeventmachine.so
+%{ruby_vendorarchdir}/fastfilereaderext.so
%files doc
%defattr(-, root, root, -)
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/Rakefile
-%{geminstdir}/docs
-%{geminstdir}/examples
-%{geminstdir}/tasks
-%{geminstdir}/tests
-%{geminstdir}/web
+%{gem_docdir}
+%{gem_instdir}/Rakefile
+%{gem_instdir}/docs
+%{gem_instdir}/examples
+%{gem_instdir}/tasks
+%{gem_instdir}/tests
+%{gem_instdir}/web
%changelog
+* Thu Jan 19 2012 Vít Ondruch <vondruch at redhat.com> - 0.12.10-6
+- Rebuilt for Ruby 1.9.3.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list