%define pkgname ohai
Summary: Profiles your system and emits JSON
Name: ruby-%{pkgname}
-Version: 7.6.0
-Release: 0.3
+Version: 8.16.0
+Release: 0.1
License: Apache v2.0
Group: Development/Languages
Source0: https://github.com/opscode/ohai/archive/%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: b28339ec7f835a2ed4ec0f876178fb14
-Patch0: virtualization-vserver.patch
+# Source0-md5: 7a2182e562bab7dcc48e0b68e07daf92
Patch1: platform-pld.patch
URL: http://docs.getchef.com/ohai.html
BuildRequires: rpm-rubyprov
BuildRequires: ruby-ipaddress
BuildRequires: ruby-mixlib-config
BuildRequires: ruby-mixlib-log
-BuildRequires: ruby-mixlib-shellout >= 2.0.0
+BuildRequires: ruby-mixlib-shellout >= 1.2
BuildRequires: ruby-rspec
BuildRequires: ruby-systemu >= 2.6.4
%endif
Requires: iproute2
Requires: lsb-release
+Requires: mount
+Requires: ruby(abi) >= 2.0
Requires: ruby-ffi >= 1.9
Requires: ruby-ffi-yajl >= 1.1
Requires: ruby-ipaddress
Requires: ruby-mixlib-cli
Requires: ruby-mixlib-config >= 2.0
Requires: ruby-mixlib-log
-Requires: mount
-Requires: ruby-mixlib-shellout >= 2.0.0
+Requires: ruby-mixlib-shellout >= 1.2
Requires: ruby-systemu >= 2.6.4
+Suggests: ruby-net-dhcp
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q -n ohai-%{version}
-#%patch0 -p1
%patch1 -p1
%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
+# don't need shellout 2.0 yet, but 2.0 is ok
+%{__sed} -i -e '/mixlib-shellout/ s/">= 2.0.0.rc.0", "< 3.0"/">= 1.2", "< 3.0"/' %{pkgname}.gemspec
+# optional
+%{__sed} -i -e '/net-dhcp/d' %{pkgname}.gemspec
+# platform specific and optional
+%{__sed} -i -e '/wmi-lite/d' %{pkgname}.gemspec
+%{__sed} -i -e '/plist/d' %{pkgname}.gemspec
+# dev dep
+%{__sed} -i -e '/rake/d' %{pkgname}.gemspec
+
# no plist and not darwin so don't care
rm spec/unit/plugins/darwin/system_profiler_spec.rb
# can't figure how to fix -r rubygems does not help
-# ohai-6.16.0/spec/unit/plugins/ruby_spec.rb:52:in `block in <top (required)>': uninitialized cons tant Gem (NameError)
+# ohai-6.16.0/spec/unit/plugins/ruby_spec.rb:52:in `block in <top (required)>': uninitialized constant Gem (NameError)
rm spec/unit/plugins/ruby_spec.rb
%build
-rake -Ilib gem
-%{__tar} -xmf pkg/ohai-%{version}*.gem
-%__gem_helper spec
+# make gemspec self-contained
+ruby -r rubygems -e 'spec = eval(File.read("%{pkgname}.gemspec"))
+ File.open("%{pkgname}-%{version}.gemspec", "w") do |file|
+ file.puts spec.to_ruby_for_cache
+end'
%if %{with tests}
# Occasionally fails with "undefined method `rfc2822' for nil:NilClass" during