Merge branch 'dev-7.0.0' into ohai-6

Conflicts:
	ruby-ohai.spec

diff --cc ruby-ohai.spec
index 93a78cdd4ef82d3ab23c1cda9e6f1dac34546e33,d729901969d5374d03e35cc92ecc57ebab950991..eca766df6d357b32a295f734cbb92a6c16465c8d
--- 1/ruby-ohai.spec
--- 2/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@@ -1,14 -1,12 +1,14 @@@
  #
 +# Release Notes: https://github.com/opscode/ohai/blob/master/CHANGELOG.md
 +#
  # Conditional build:
- %bcond_without        tests           # build without tests
+ %bcond_with   tests           # build without tests
  
  %define pkgname ohai
  Summary:      Profiles your system and emits JSON
  Name:         ruby-%{pkgname}
- Version:      6.24.2
- Release:      2
+ Version:      7.4.0
 -Release:      0.2
++Release:      0.3
  License:      Apache v2.0
  Group:                Development/Languages
  Source0:      https://github.com/opscode/ohai/archive/%{version}/%{pkgname}-%{version}.tar.gz
@@@ -26,21 -24,20 +26,22 @@@ BuildRequires:     ruby-ffi-yajl >= 1.
  BuildRequires:        ruby-ipaddress
  BuildRequires:        ruby-mixlib-config
  BuildRequires:        ruby-mixlib-log
- BuildRequires:        ruby-mixlib-shellout
+ BuildRequires:        ruby-mixlib-shellout >= 1.2
  BuildRequires:        ruby-rspec
- BuildRequires:        ruby-systemu >= 2.5.2
- BuildRequires:        ruby-yajl
+ BuildRequires:        ruby-systemu >= 2.6.4
  %endif
 +Requires:     iproute2
  Requires:     lsb-release
+ Requires:     ruby-ffi >= 1.9
+ Requires:     ruby-ffi-yajl >= 1.0
  Requires:     ruby-ipaddress
+ Requires:     ruby-mime-types >= 1.16
  Requires:     ruby-mixlib-cli
- Requires:     ruby-mixlib-config
+ Requires:     ruby-mixlib-config >= 2.0
  Requires:     ruby-mixlib-log
- Requires:     ruby-mixlib-shellout
- Requires:     ruby-systemu >= 2.5.2-3
- Requires:     ruby-yajl
 +Requires:     mount
+ Requires:     ruby-mixlib-shellout >= 1.2
+ Requires:     ruby-systemu >= 2.6.4
  BuildArch:    noarch
  BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)