Merge branch 'dev-7.0.0' into ohai-6

Conflicts:
	ruby-ohai.spec

diff --git a/ruby-ohai.spec b/ruby-ohai.spec
index d729901969d5374d03e35cc92ecc57ebab950991..eca766df6d357b32a295f734cbb92a6c16465c8d 100644 (file)
--- a/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@ -1,4 +1,6 @@
 #
+# Release Notes: https://github.com/opscode/ohai/blob/master/CHANGELOG.md
+#
 # Conditional build:
 %bcond_with    tests           # build without tests
 
@@ -6,7 +8,7 @@
 Summary:       Profiles your system and emits JSON
 Name:          ruby-%{pkgname}
 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
@@ -28,6 +30,7 @@ BuildRequires:        ruby-mixlib-shellout >= 1.2
 BuildRequires: ruby-rspec
 BuildRequires: ruby-systemu >= 2.6.4
 %endif
+Requires:      iproute2
 Requires:      lsb-release
 Requires:      ruby-ffi >= 1.9
 Requires:      ruby-ffi-yajl >= 1.0
@@ -36,6 +39,7 @@ Requires:     ruby-mime-types >= 1.16
 Requires:      ruby-mixlib-cli
 Requires:      ruby-mixlib-config >= 2.0
 Requires:      ruby-mixlib-log
+Requires:      mount
 Requires:      ruby-mixlib-shellout >= 1.2
 Requires:      ruby-systemu >= 2.6.4
 BuildArch:     noarch