[rubygem-ammeter] Fix FTBFS in Rawhide (hrbz#1107063).

Vít Ondruch vondruch at fedoraproject.org
Tue Jun 10 12:05:56 UTC 2014


commit 5216ca8ae20c40db147b8ba30a12fa54c60eb77d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Jun 10 14:05:37 2014 +0200

    Fix FTBFS in Rawhide (hrbz#1107063).

 ...m-ammeter-1.0.0-fix-to-specs-for-ruby-2.1.patch |   38 ++++++++++++++++++++
 rubygem-ammeter.spec                               |   21 +++++------
 2 files changed, 47 insertions(+), 12 deletions(-)
---
diff --git a/rubygem-ammeter-1.0.0-fix-to-specs-for-ruby-2.1.patch b/rubygem-ammeter-1.0.0-fix-to-specs-for-ruby-2.1.patch
new file mode 100644
index 0000000..dcc64af
--- /dev/null
+++ b/rubygem-ammeter-1.0.0-fix-to-specs-for-ruby-2.1.patch
@@ -0,0 +1,38 @@
+From 86f125c4b79f86bb9bd398393e15bc7f2f8973d2 Mon Sep 17 00:00:00 2001
+From: Alex Rothenberg <alex at alexrothenberg.com>
+Date: Fri, 21 Mar 2014 12:22:09 -0400
+Subject: [PATCH] fix to specs for ruby 2.1
+
+---
+ .travis.yml                                           | 1 +
+ spec/ammeter/rspec/generator/matchers/contain_spec.rb | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index fbb6216..21629c1 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,6 +1,7 @@
+ script: "bundle exec rake ci"
+ rvm:
+   - ruby-head
++  - 2.1.1
+   - 2.0.0
+   - 1.9.3
+   - 1.8.7
+diff --git a/spec/ammeter/rspec/generator/matchers/contain_spec.rb b/spec/ammeter/rspec/generator/matchers/contain_spec.rb
+index 1c40bea..924644c 100644
+--- a/spec/ammeter/rspec/generator/matchers/contain_spec.rb
++++ b/spec/ammeter/rspec/generator/matchers/contain_spec.rb
+@@ -23,7 +23,7 @@
+     it 'raises an error when the file does not exist' do
+       expect do
+         'some/file/that/does/not/exist'.should contain 'something'
+-      end.to raise_error 'No such file or directory - some/file/that/does/not/exist'
++      end.to raise_error /No such file or directory/
+     end
+   end
+ end
+-- 
+1.9.3
+
diff --git a/rubygem-ammeter.spec b/rubygem-ammeter.spec
index 5c5863b..8c3cd2d 100644
--- a/rubygem-ammeter.spec
+++ b/rubygem-ammeter.spec
@@ -4,25 +4,16 @@
 Summary: Write specs for your Rails 3+ generators
 Name: rubygem-%{gem_name}
 Version: 0.2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: https://github.com/alexrothenberg/%{gem_name}
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(release)
-Requires: ruby(rubygems) 
-Requires: rubygem(activesupport) >= 3.0
-Requires: rubygem(railties) >= 3.0
-Requires: rubygem(rspec) >= 2.2
-Requires: rubygem(rspec-rails) >= 2.2
+Patch0: rubygem-ammeter-1.0.0-fix-to-specs-for-ruby-2.1.patch
 BuildRequires: rubygems-devel
-BuildRequires: rubygem(activesupport) >= 3.0
-BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(railties) >= 3.0
-BuildRequires: rubygem(rspec) >= 2.2
 BuildRequires: rubygem(rspec-rails) >= 2.2
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Write specs for your Rails 3+ generators.
@@ -41,6 +32,10 @@ Documentation for %{name}
 %setup -q -c -T
 %gem_install -n %{SOURCE0}
 
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
 %build
 
 %install
@@ -58,7 +53,6 @@ popd
 %{gem_libdir}
 %exclude %{gem_cache}
 %exclude %{gem_instdir}/.*
-%exclude %{gem_libdir}/.DS_Store
 %doc %{gem_instdir}/LICENSE.txt
 %{gem_spec}
 
@@ -73,6 +67,9 @@ popd
 %{gem_instdir}/spec
 
 %changelog
+* Tue Jun 10 2014 Vít Ondruch <vondruch at redhat.com> - 0.2.9-3
+- Fix FTBFS in Rawhide (hrbz#1107063).
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list