commit e7d4a0b058ad6643a895912c4055ee1efb994b9e
Author: Elan Ruusamäe <[email protected]>
Date: Thu Dec 4 17:34:40 2014 +0200
avoid taking ohai version from system ohai when building gem
ruby-ohai.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/ruby-ohai.spec b/ruby-ohai.spec
index f25b58c..4d8d227 100644
--- a/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@ -20,6 +20,8 @@ BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.665
BuildRequires: ruby-rake
BuildRequires: sed >= 4.0
+# rake gem uses installed ohai version not version we intend to build!
+BuildConflicts: ruby-ohai
%if %{with tests}
BuildRequires: ruby-ffi >= 1.9
BuildRequires: ruby-ffi-yajl >= 1.1
@@ -72,7 +74,7 @@ rm spec/unit/plugins/darwin/system_profiler_spec.rb
rm spec/unit/plugins/ruby_spec.rb
%build
-rake gem
+rake -Ilib gem
%{__tar} -xmf pkg/ohai-%{version}*.gem
%__gem_helper spec
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ohai.git/commitdiff/956fb16927eadc5dfb313f46e9293c01f868ede1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
