Fixes #6764 - removed extra/ directory and ftools/open4 deps

theforeman · Jan 20, 2015 · a7f52e8 · a7f52e8
1 parent 4aea188
commit a7f52e8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 27 deletions.
diff --git a/comps/comps-foreman-plugins-fedora19.xml b/comps/comps-foreman-plugins-fedora19.xml
@@ -55,14 +55,12 @@
       <packagereq type="default">rubygem-diffy</packagereq>
       <packagereq type="default">rubygem-docker-api</packagereq>
       <packagereq type="default">rubygem-dynflow</packagereq>
-      <packagereq type="default">rubygem-ftools</packagereq>
       <packagereq type="default">rubygem-graphite-api</packagereq>
       <packagereq type="default">rubygem-hammer_cli_foreman_ssh</packagereq>
       <packagereq type="default">rubygem-jgrep</packagereq>
       <packagereq type="default">rubygem-less</packagereq>
       <packagereq type="default">rubygem-less-rails</packagereq>
       <packagereq type="default">rubygem-logify</packagereq>
-      <packagereq type="default">rubygem-open4</packagereq>
       <packagereq type="default">rubygem-opennebula</packagereq>
       <packagereq type="default">rubygem-satyr</packagereq>
       <packagereq type="default">rubygem-sprockets-rails</packagereq>
@@ -112,15 +110,13 @@
       <packagereq type="default">rubygem-foreman-tasks-doc</packagereq>
       <packagereq type="default">rubygem-foreman_templates-doc</packagereq>
       <packagereq type="default">rubygem-foreman_xen-doc</packagereq>
-      <packagereq type="default">rubygem-ftools-doc</packagereq>
       <packagereq type="default">rubygem-graphite-api-doc</packagereq>
       <packagereq type="default">rubygem-hammer_cli_foreman_bootdisk-doc</packagereq>
       <packagereq type="default">rubygem-hammer_cli_foreman_ssh-doc</packagereq>
       <packagereq type="default">rubygem-jgrep-doc</packagereq>
       <packagereq type="default">rubygem-less-doc</packagereq>
       <packagereq type="default">rubygem-less-rails-doc</packagereq>
       <packagereq type="default">rubygem-logify-doc</packagereq>
-      <packagereq type="default">rubygem-open4-doc</packagereq>
       <packagereq type="default">rubygem-opennebula-doc</packagereq>
       <packagereq type="default">rubygem-ovirt_provision_plugin-doc</packagereq>
       <packagereq type="default">rubygem-satyr-doc</packagereq>

diff --git a/comps/comps-foreman-plugins-rhel6.xml b/comps/comps-foreman-plugins-rhel6.xml
@@ -56,14 +56,12 @@
       <packagereq type="default">ruby193-rubygem-diffy</packagereq>
       <packagereq type="default">ruby193-rubygem-docker-api</packagereq>
       <packagereq type="default">ruby193-rubygem-dynflow</packagereq>
-      <packagereq type="default">ruby193-rubygem-ftools</packagereq>
       <packagereq type="default">ruby193-rubygem-graphite-api</packagereq>
       <packagereq type="default">ruby193-rubygem-jgrep</packagereq>
       <packagereq type="default">ruby193-rubygem-less</packagereq>
       <packagereq type="default">ruby193-rubygem-less-rails</packagereq>
       <packagereq type="default">ruby193-rubygem-little-plugger</packagereq>
       <packagereq type="default">ruby193-rubygem-logging</packagereq>
-      <packagereq type="default">ruby193-rubygem-open4</packagereq>
       <packagereq type="default">ruby193-rubygem-opennebula</packagereq>
       <packagereq type="default">ruby193-rubygem-sprockets-rails</packagereq>
       <packagereq type="default">ruby193-rubygem-wicked</packagereq>
@@ -113,14 +111,12 @@
       <packagereq type="default">ruby193-rubygem-foreman-tasks-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-foreman_templates-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-foreman_xen-doc</packagereq>
-      <packagereq type="default">ruby193-rubygem-ftools-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-graphite-api-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-jgrep-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-less-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-less-rails-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-little-plugger-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-logging-doc</packagereq>
-      <packagereq type="default">ruby193-rubygem-open4-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-opennebula-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-ovirt_provision_plugin-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-sprockets-rails-doc</packagereq>

diff --git a/comps/comps-foreman-plugins-rhel7.xml b/comps/comps-foreman-plugins-rhel7.xml
@@ -57,14 +57,12 @@
       <packagereq type="default">ruby193-rubygem-diffy</packagereq>
       <packagereq type="default">ruby193-rubygem-docker-api</packagereq>
       <packagereq type="default">ruby193-rubygem-dynflow</packagereq>
-      <packagereq type="default">ruby193-rubygem-ftools</packagereq>
       <packagereq type="default">ruby193-rubygem-graphite-api</packagereq>
       <packagereq type="default">ruby193-rubygem-jgrep</packagereq>
       <packagereq type="default">ruby193-rubygem-less</packagereq>
       <packagereq type="default">ruby193-rubygem-less-rails</packagereq>
       <packagereq type="default">ruby193-rubygem-little-plugger</packagereq>
       <packagereq type="default">ruby193-rubygem-logging</packagereq>
-      <packagereq type="default">ruby193-rubygem-open4</packagereq>
       <packagereq type="default">ruby193-rubygem-opennebula</packagereq>
       <packagereq type="default">ruby193-rubygem-sprockets-rails</packagereq>
       <packagereq type="default">ruby193-rubygem-wicked</packagereq>
@@ -117,14 +115,12 @@
       <packagereq type="default">ruby193-rubygem-foreman-tasks-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-foreman_templates-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-foreman_xen-doc</packagereq>
-      <packagereq type="default">ruby193-rubygem-ftools-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-graphite-api-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-jgrep-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-less-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-less-rails-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-little-plugger-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-logging-doc</packagereq>
-      <packagereq type="default">ruby193-rubygem-open4-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-opennebula-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-ovirt_provision_plugin-doc</packagereq>
       <packagereq type="default">ruby193-rubygem-sprockets-rails-doc</packagereq>

diff --git a/rubygem-foreman_discovery/rubygem-foreman_discovery.spec b/rubygem-foreman_discovery/rubygem-foreman_discovery.spec
@@ -35,8 +35,6 @@ URL:        http://github.com/theforeman/foreman_discovery
 Source0:    http://rubygems.org/downloads/%{gem_name}-%{version}%{?prever}.gem
 
 Requires:   foreman >= 1.6.0
-Requires:   %{?scl_prefix}rubygem(open4)
-Requires:   %{?scl_prefix}rubygem(ftools)
 Requires:   advancecomp
 Requires:   squashfs-tools
 Requires:   sudo
@@ -92,28 +90,16 @@ cat <<GEMFILE > %{buildroot}%{foreman_bundlerd_dir}/%{gem_name}.rb
 gem '%{gem_name}'
 GEMFILE
 
-mkdir -p %{buildroot}/etc/sudoers.d
-cat <<SUDOERS > %{buildroot}/etc/sudoers.d/%{gem_name}
-# Required to run the discovery:build_image rake task as 'foreman'
-foreman ALL = NOPASSWD : %{gem_instdir}/extra/build_iso.sh *, /bin/true
-Defaults:foreman !requiretty
-SUDOERS
-
-# Output directory of the imgae build task
-mkdir -p %{buildroot}/%{foreman_dir}/discovery_image
-
 %files
 %dir %{gem_instdir}
 %{gem_instdir}/app
 %{gem_instdir}/lib
 %{gem_instdir}/config
-%{gem_instdir}/extra
+%exclude %{gem_instdir}/extra
 %{gem_instdir}/locale
 %exclude %{gem_cache}
 %{gem_spec}
 %{foreman_bundlerd_dir}/%{gem_name}.rb
-%attr(0755,foreman,foreman) %{foreman_dir}/discovery_image
-%config %attr(0440,root,root) /etc/sudoers.d/%{gem_name}
 %doc %{gem_instdir}/LICENSE
 
 %exclude %{gem_instdir}/test