[rubygem-facon] Fix bz#715948 FTBFS bug for rubygem-facon
Michael Stahnke
stahnma at fedoraproject.org
Sun Jan 8 22:15:29 UTC 2012
commit c511ccb3515addad7915e1d7895a5088745e140b
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date: Sun Jan 8 09:50:13 2012 -0600
Fix bz#715948 FTBFS bug for rubygem-facon
This commit fixes facon to build proplery and updates the verion to
0.5.0.
Signed-off-by: Michael Stahnke <stahnma at puppetlabs.com>
expectation_spec.rb.patch | 22 ----------------------
rubygem-facon.spec | 32 +++++++++++++++++++-------------
2 files changed, 19 insertions(+), 35 deletions(-)
---
diff --git a/rubygem-facon.spec b/rubygem-facon.spec
index da86d87..902ee17 100644
--- a/rubygem-facon.spec
+++ b/rubygem-facon.spec
@@ -4,21 +4,20 @@
Summary: Tiny mocking library
Name: rubygem-%{gemname}
-Version: 0.4.1
-Release: 3%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/chuyeow/facon/
Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-Patch0: expectation_spec.rb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygems
Requires: ruby(abi) = 1.8
-Requires: rubygem(bacon)
+Requires: rubygem(bacon)
BuildRequires: rubygems
-BuildRequires(check): rubygem(hoe)
-BuildRequires(check): rubygem(rspec)
-BuildRequires(check): rubygem(bacon)
+# These two BR are for %%check
+BuildRequires: rubygem(rake)
+BuildRequires: rubygem(bundler)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}
@@ -45,9 +44,6 @@ gem install \
-V \
%{SOURCE0}
-pushd ./%{geminstdir}/spec
-%patch0 -p0
-
%build
@@ -56,11 +52,19 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
cp -a ./%{gemdir}/* \
%{buildroot}%{gemdir}/
+rm -f %{buildroot}%{geminstdir}/.gitignore
+rm -f %{buildroot}%{geminstdir}/Gemfile.lock
+rm -f %{buildroot}%{geminstdir}/Gemfile
+pushd %{buildroot}%{geminstdir}
+sed -i -e 's|require "bundler"||' spec/spec_helper.rb
+sed -i -e 's|Bundler.setup||' spec/spec_helper.rb
+
+
%clean
rm -rf %{buildroot}
-%check
+%check
cd %{buildroot}%{geminstdir}
rake spec
@@ -68,10 +72,9 @@ rake spec
%defattr(-, root, root, -)
%dir %{geminstdir}
%doc %{geminstdir}/Changelog.txt
-%doc %{geminstdir}/History.txt
-%doc %{geminstdir}/Manifest.txt
%doc %{geminstdir}/README.txt
%{geminstdir}/lib
+%{geminstdir}/%{gemname}.gemspec
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
@@ -82,6 +85,9 @@ rake spec
%{gemdir}/doc/%{gemname}-%{version}
%changelog
+* Sat Jan 07 2012 <stahnma at fedoraproject.org> - 0.5.0-1
+- Fix bug #715948
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list