net/dhcp no longer required in ohai code

diff --git a/ruby-ohai.spec b/ruby-ohai.spec
index ffeb386c783def815c87d5c5284e49aaaf94e838..a8f323e122e2a525d8fddd434c7710524e0c24c1 100644 (file)
--- a/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@ -14,7 +14,6 @@ Group:                Development/Languages
 Source0:       https://github.com/opscode/ohai/archive/%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5: 7a2182e562bab7dcc48e0b68e07daf92
 Patch1:                platform-pld.patch
-#Patch2:               soft-net-dhcp.patch
 URL:           http://docs.getchef.com/ohai.html
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.665
@@ -65,7 +64,6 @@ This package contains documentation for %{name}.
 %prep
 %setup -q -n ohai-%{version}
 %patch1 -p1
-#%patch2 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
 # don't need shellout 2.0 yet, but 2.0 is ok

diff --git a/soft-net-dhcp.patch b/soft-net-dhcp.patch
deleted file mode 100644 (file)
index 293c86a..0000000
--- a/soft-net-dhcp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-require net/dhcp only when cloudstack hint present
-
---- ./lib/ohai/mixin/cloudstack_metadata.rb~   2014-12-01 22:01:15.000000000 +0200
-+++ ./lib/ohai/mixin/cloudstack_metadata.rb    2014-12-04 17:21:55.363338588 +0200
-@@ -17,7 +17,6 @@
- 
- require 'ohai/mixin/ec2_metadata'
- require 'ohai/hints'
--require 'net/dhcp'
- require 'socket'
- 
- 
-@@ -30,6 +29,8 @@
-         response = ''
-         if Ohai::Hints.hint?('cloudstack')
-           begin
-+                      require 'net/dhcp'
-+
-             request = DHCP::Discover.new
- 
-             listensock = UDPSocket.new