[rubygem-bourne] Update for Mocha 1.0 compatibility

Ken Dreyer ktdreyer at fedoraproject.org
Thu Jul 17 16:22:02 UTC 2014


commit 20f7b306a40db0c28327a43ba4c4062230512889
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Thu Jul 17 10:22:05 2014 -0600

    Update for Mocha 1.0 compatibility

 rubygem-bourne.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/rubygem-bourne.spec b/rubygem-bourne.spec
index 4574812..6f041f7 100644
--- a/rubygem-bourne.spec
+++ b/rubygem-bourne.spec
@@ -2,7 +2,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 1.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Adds test spies to mocha
 Group: Development/Languages
 License: MIT
@@ -15,14 +15,12 @@ Patch0: rubygem-bourne-1.5.0-minitest.patch
 %if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
 Requires: ruby(release)
 Requires: ruby(rubygems)
-Requires: rubygem(mocha) >= 0.13.2
-Requires: rubygem(mocha) < 0.15
+Requires: rubygem(mocha) < 2
 %endif
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(minitest) >= 5
-BuildRequires: rubygem(mocha) >= 0.13.2
-BuildRequires: rubygem(mocha) < 0.15
+BuildRequires: rubygem(mocha) < 2
 BuildArch: noarch
 %if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
 Provides: rubygem(%{gem_name}) = %{version}
@@ -55,6 +53,12 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 # https://github.com/thoughtbot/bourne/pull/33
 %patch0 -p1
 
+# Mocha 1.0 support
+# https://github.com/thoughtbot/bourne/pull/32
+# (We just drop the version numbers here altogether and let the packaging
+# system handle the versions.)
+sed -i "/mocha/{s/\(_dependency([^,]*\), .*/\1)/}" %{gem_name}.gemspec
+
 # Remove developer-only files.
 for f in .gitignore .travis.yml Gemfile Rakefile; do
   rm $f
@@ -94,6 +98,9 @@ popd
 %exclude %{gem_instdir}/test
 
 %changelog
+* Thu Jul 17 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.5.0-5
+- Update for Mocha 1.0 compatibility
+
 * Tue Jun 10 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.5.0-4
 - Use HTTPS URL
 - Remove dot files during %%prep


More information about the scm-commits mailing list