From 8159be99b816e2e4b6a43777cbc33dd225e90898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Sat, 23 Feb 2013 15:11:25 +0100 Subject: [PATCH] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 --- rubygem-aruba.spec | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/rubygem-aruba.spec b/rubygem-aruba.spec index e6e46d6..4b29bd4 100644 --- a/rubygem-aruba.spec +++ b/rubygem-aruba.spec @@ -1,11 +1,10 @@ # Generated from aruba-0.4.11.gem by gem2rpm -*- rpm-spec -*- %global gem_name aruba -%global rubyabi 1.9.1 Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba Name: rubygem-%{gem_name} Version: 0.4.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Languages # aruba itself is MIT # icons in templates/images are CC-BY @@ -17,14 +16,14 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Patch0: aruba-downgrade-childprocess-dependency.patch # https://github.com/cucumber/aruba/commit/3f8ed748d73fa9d39fe163f14540a7ef2a53a5c1 Patch1: aruba-disable-test-that-do-not-actually-test-output.patch -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Requires: rubygem(cucumber) >= 1.1.1 Requires: rubygem(childprocess) >= 0.2.0 # Doesn't work with ffi 1.0.10, see https://github.com/cucumber/aruba/issues/114 Conflicts: rubygem(ffi) = 1.0.10 Requires: rubygem(rspec) >= 2.7.0 -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby BuildRequires: rubygem(cucumber) >= 1.1.1 @@ -52,9 +51,7 @@ Documentation for %{name} %prep %setup -q -c -T -mkdir -p .%{gem_dir} -gem install --local --install-dir .%{gem_dir} \ - --force %{SOURCE0} +%gem_install -n %{SOURCE0} pushd .%{gem_dir} %patch0 -p0 @@ -74,8 +71,10 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} cucumber -# fix wrong parameter for Process.new (already fixed upstream) -sed -i 's|0, |0.1, |' spec/aruba/process_spec.rb +# Wrongly designed test case. Process, which output should be read executes +# so fast, that it finished prior the output could be catched. +# https://github.com/cucumber/aruba/issues/146 +sed -i '22,30 s|^|#|' spec/aruba/process_spec.rb rspec spec popd @@ -102,6 +101,9 @@ popd %{gem_instdir}/templates %changelog +* Sat Feb 23 2013 Vít Ondruch - 0.4.11-6 +- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 + * Mon Feb 18 2013 Bohuslav Kabrda - 0.4.11-5 - Disable tests that do not actually test anything (patch from upstream).