From 226ba5c5fd4bbd224abd27a6e847e4789cc2e8d2 Mon Sep 17 00:00:00 2001 From: cfouant Date: Fri, 27 May 2016 13:40:28 -0400 Subject: [PATCH] fixes #14858 - removes gutterball (#213) (cherry picked from commit d6a7aecc44beb2e2e2642bc7b9b2d45783a556bd) --- .../comps-katello-candlepin-server-rhel6.xml | 1 - .../comps-katello-candlepin-server-rhel7.xml | 1 - comps/comps-katello-server-rhel6.xml | 4 - comps/comps-katello-server-rhel7.xml | 4 - katello/katello-backup | 1 - katello/katello-remove | 5 -- katello/katello.spec | 2 - rel-eng/packages/rubygem-foreman_gutterball | 1 - .../packages/rubygem-hammer_cli_gutterball | 1 - .../foreman_gutterball-0.0.1.gem | 1 - .../rubygem-foreman_gutterball.spec | 83 ----------------- .../hammer_cli_gutterball-1.0.1.gem | 1 - .../rubygem-hammer_cli_gutterball.spec | 89 ------------------- 13 files changed, 194 deletions(-) delete mode 100644 rel-eng/packages/rubygem-foreman_gutterball delete mode 100644 rel-eng/packages/rubygem-hammer_cli_gutterball delete mode 120000 rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem delete mode 100644 rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec delete mode 120000 rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem delete mode 100644 rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec diff --git a/comps/comps-katello-candlepin-server-rhel6.xml b/comps/comps-katello-candlepin-server-rhel6.xml index 04e67a47..63a29255 100644 --- a/comps/comps-katello-candlepin-server-rhel6.xml +++ b/comps/comps-katello-candlepin-server-rhel6.xml @@ -14,7 +14,6 @@ candlepin candlepin-common candlepin-selinux - gutterball diff --git a/comps/comps-katello-candlepin-server-rhel7.xml b/comps/comps-katello-candlepin-server-rhel7.xml index 04e67a47..63a29255 100644 --- a/comps/comps-katello-candlepin-server-rhel7.xml +++ b/comps/comps-katello-candlepin-server-rhel7.xml @@ -14,7 +14,6 @@ candlepin candlepin-common candlepin-selinux - gutterball diff --git a/comps/comps-katello-server-rhel6.xml b/comps/comps-katello-server-rhel6.xml index 36358c15..7a0dcb42 100644 --- a/comps/comps-katello-server-rhel6.xml +++ b/comps/comps-katello-server-rhel6.xml @@ -47,10 +47,6 @@ tfm-rubygem-terminal-table tfm-rubygem-qpid_messaging tfm-rubygem-hammer_cli_csv - - - tfm-rubygem-foreman_gutterball - tfm-rubygem-hammer_cli_gutterball diff --git a/comps/comps-katello-server-rhel7.xml b/comps/comps-katello-server-rhel7.xml index 7edba5cd..c429e2fa 100644 --- a/comps/comps-katello-server-rhel7.xml +++ b/comps/comps-katello-server-rhel7.xml @@ -48,10 +48,6 @@ tfm-rubygem-terminal-table tfm-rubygem-qpid_messaging tfm-rubygem-hammer_cli_csv - - - tfm-rubygem-foreman_gutterball - tfm-rubygem-hammer_cli_gutterball diff --git a/katello/katello-backup b/katello/katello-backup index 0df41fb6..9b4fc5fa 100755 --- a/katello/katello-backup +++ b/katello/katello-backup @@ -55,7 +55,6 @@ else '/etc/candlepin', '/etc/foreman', '/etc/foreman-proxy', - '/etc/gutterball', '/etc/hammer', '/etc/httpd', '/etc/foreman-installer', diff --git a/katello/katello-remove b/katello/katello-remove index 4693bd52..26ade58b 100755 --- a/katello/katello-remove +++ b/katello/katello-remove @@ -57,7 +57,6 @@ CONFIG_FILES=( /etc/tomcat /etc/squid /etc/puppet - /etc/gutterball /etc/qpid /etc/qpid-dispatch /etc/sysconfig/foreman.rpmsave @@ -73,7 +72,6 @@ LOG_FILES=( /var/log/foreman /var/log/foreman-proxy /var/log/foreman-installer - /var/log/gutterball /var/log/tomcat /var/log/squid /var/log/capsule-certs-generate* @@ -110,7 +108,6 @@ RPMS=( `rpm -qa | grep ^python-semantic-version` `rpm -qa | grep ^python-requests` `rpm -qa | grep ^python-isodate` - `rpm -qa | grep gutterball` `rpm -qa | grep $HOSTNAME` `rpm -qa | grep saslwrapper` `rpm -qa | grep ruby` @@ -159,10 +156,8 @@ CONTENT=( /var/cache/candlepin /var/cache/foreman-proxy /var/cache/ - /usr/bin/gutterball-db /opt/theforeman /var/www/html/pub/katello-rhsm-consumer - /tmp/gutterballkeystore.p12 ) katello-service stop diff --git a/katello/katello.spec b/katello/katello.spec index 4e74f7fc..7fe639fd 100644 --- a/katello/katello.spec +++ b/katello/katello.spec @@ -114,8 +114,6 @@ Requires: %{?scl_prefix}rubygem-hammer_cli Requires: %{?scl_prefix}rubygem-hammer_cli_foreman Requires: %{?scl_prefix}rubygem-hammer_cli_katello Requires: %{?scl_prefix}rubygem-hammer_cli_import -Requires: %{?scl_prefix}rubygem-hammer_cli_gutterball -Requires: %{?scl_prefix}rubygem-foreman_gutterball Requires: %{name}-debug Requires: %{name}-service diff --git a/rel-eng/packages/rubygem-foreman_gutterball b/rel-eng/packages/rubygem-foreman_gutterball deleted file mode 100644 index c5d3b08c..00000000 --- a/rel-eng/packages/rubygem-foreman_gutterball +++ /dev/null @@ -1 +0,0 @@ -0.0.1-5.fm1_11 rubygem-foreman_gutterball/ diff --git a/rel-eng/packages/rubygem-hammer_cli_gutterball b/rel-eng/packages/rubygem-hammer_cli_gutterball deleted file mode 100644 index 6ec03467..00000000 --- a/rel-eng/packages/rubygem-hammer_cli_gutterball +++ /dev/null @@ -1 +0,0 @@ -1.0.1-5.fm1_11 rubygem-hammer_cli_gutterball/ diff --git a/rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem b/rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem deleted file mode 120000 index a981e8ec..00000000 --- a/rubygem-foreman_gutterball/foreman_gutterball-0.0.1.gem +++ /dev/null @@ -1 +0,0 @@ -../.git/annex/objects/1M/VK/SHA256E-s21504--6a514fb75304e434404cdf826599203dec58d1877fd1b5b946264c2625cb151a.1.gem/SHA256E-s21504--6a514fb75304e434404cdf826599203dec58d1877fd1b5b946264c2625cb151a.1.gem \ No newline at end of file diff --git a/rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec b/rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec deleted file mode 100644 index fd265681..00000000 --- a/rubygem-foreman_gutterball/rubygem-foreman_gutterball.spec +++ /dev/null @@ -1,83 +0,0 @@ -%{?scl:%scl_package rubygem-%{gem_name}} -%{!?scl:%global pkg_name %{name}} - -%global gem_name foreman_gutterball - -Summary: Gutterball plugin for Foreman and Katello -Name: %{?scl_prefix}rubygem-%{gem_name} -Version: 0.0.1 -Release: 5%{?dist} -Group: Development/Languages -License: GPLv3 -URL: http://katello.org -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem - -BuildArch: noarch -Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version} -%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}} - -Requires: gutterball -Requires: %{?scl_prefix}rubygem-katello -Requires: %{?scl_prefix_ruby}ruby(rubygems) -Requires: %{?scl_prefix_ruby}ruby(release) - -BuildRequires: %{?scl_prefix_ruby}ruby(rubygems) -BuildRequires: %{?scl_prefix_ruby}rubygems-devel -BuildRequires: foreman-plugin >= 1.11 - -%description -Gutterball plugin for Foreman and Katello. - -%prep -%setup -q -c -T -%{__install} --directory .%{gem_dir} -%{?scl:scl enable %{scl} "} -gem install --local --install-dir .%{gem_dir} --force %{SOURCE0} --no-rdoc --no-ri -%{?scl:"} - -%build - -%install -# it's recommended to clean your buildroot first -%{__rm} --recursive --force %{buildroot} - -%{__install} --directory %{buildroot}%{gem_dir} -%{__cp} --archive .%{gem_dir}/cache %{buildroot}%{gem_dir}/ -%{__cp} --archive .%{gem_dir}/doc %{buildroot}%{gem_dir}/ -%{__cp} --archive .%{gem_dir}/gems %{buildroot}%{gem_dir}/ -%{__cp} --archive .%{gem_dir}/specifications %{buildroot}%{gem_dir}/ - -%{__install} --directory %{buildroot}%{foreman_bundlerd_dir} - -%foreman_bundlerd_file - -%clean -%{__rm} --recursive --force %{buildroot} .%{gem_dir} - -%files -%{gem_instdir}/Rakefile -%{gem_instdir}/LICENSE -%{gem_instdir}/README.md -%{gem_instdir}/app/ -%{gem_instdir}/lib/ -%{gem_instdir}/config/ -%{gem_instdir}/test/ -%{gem_spec} -%{gem_cache} -%{foreman_bundlerd_plugin} - -%changelog -* Wed Feb 03 2016 Eric D Helms 0.0.1-5 -- Don't set user/group permissions in files list (ericdhelms@gmail.com) - -* Fri Jan 22 2016 Eric D Helms 0.0.1-4 -- Update rubygem-foreman_gutterball to RHSCL ruby22 (ericdhelms@gmail.com) - -* Fri Aug 28 2015 Eric D. Helms 0.0.1-3 -- new package built with tito - -* Wed Jul 29 2015 Eric D. Helms 0.0.1-2 -- new package built with tito - -* Wed Dec 03 2014 Adam Price - 0.0.1-1 -- Initial package diff --git a/rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem b/rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem deleted file mode 120000 index cce99139..00000000 --- a/rubygem-hammer_cli_gutterball/hammer_cli_gutterball-1.0.1.gem +++ /dev/null @@ -1 +0,0 @@ -../.git/annex/objects/MG/kV/SHA256E-s17408--c4efba2373a1753b842b13467d00777a48850a8926275785121a1d8ae27091b6.1.gem/SHA256E-s17408--c4efba2373a1753b842b13467d00777a48850a8926275785121a1d8ae27091b6.1.gem \ No newline at end of file diff --git a/rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec b/rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec deleted file mode 100644 index 826a0988..00000000 --- a/rubygem-hammer_cli_gutterball/rubygem-hammer_cli_gutterball.spec +++ /dev/null @@ -1,89 +0,0 @@ -%{?scl:%scl_package rubygem-%{gem_name}} -%{!?scl:%global pkg_name %{name}} - -%{!?_root_sysconfdir:%global _root_sysconfdir %{_sysconfdir}} - -%global gem_name hammer_cli_gutterball -%global confdir hammer - -Summary: Gutterball commands for Hammer -Name: %{?scl_prefix}rubygem-%{gem_name} -Version: 1.0.1 -Release: 5%{?dist} -Group: Development/Languages -License: GPLv3 -URL: http://github.com/Katello/hammer-cli-gutterball -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem - -BuildArch: noarch -Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version} -%if 0%{?scl:1} -Obsoletes: rubygem-%{gem_name} < 1.0.1-3 -%endif -%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}} - -Requires: %{?scl_prefix_ruby}ruby(release) -Requires: %{?scl_prefix_ruby}ruby(rubygems) -Requires: %{?scl_prefix}rubygem(hammer_cli) >= 0.1.1 - -BuildRequires: %{?scl_prefix_ruby}ruby(rubygems) -BuildRequires: %{?scl_prefix_ruby}rubygems-devel - -%description -Hammer-CLI-Gutterball is a Hammer module which provides additional functionality for use with the foreman_gutterball plugin. - -%package doc -Summary: Documentation for %{pkg_name} -Group: Documentation -Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release} -BuildArch: noarch -%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}-doc} - -%description doc -Documentation for %{pkg_name} - -%prep -%setup -q -c -T -n %{pkg_name}-%{version} -mkdir -p .%{gem_dir} -%{?scl:scl enable %{scl} - << \EOF} -gem install --local --install-dir .%{gem_dir} \ - --force %{SOURCE0} -%{?scl:EOF} - -%install -mkdir -p %{buildroot}%{_root_sysconfdir}/%{confdir}/cli.modules.d -install -m 755 .%{gem_instdir}/config/gutterball.yml %{buildroot}%{_root_sysconfdir}/%{confdir}/cli.modules.d/gutterball.yml - -mkdir -p %{buildroot}%{gem_dir} -cp -pa .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ - -%files -%dir %{gem_instdir} -%{gem_instdir}/lib -%doc %{gem_instdir}/LICENSE -%config(noreplace) %{_root_sysconfdir}/%{confdir}/cli.modules.d/gutterball.yml -%exclude %{gem_cache} -%{gem_spec} - -%files doc -%doc %{gem_docdir} -%doc %{gem_instdir}/config -%doc %{gem_instdir}/README.md - -%changelog -* Wed Jan 06 2016 Eric D. Helms 1.0.1-5 -- Build rubygem-hammer_cli_gutterball for RH22 SCL (ericdhelms@gmail.com) - -* Fri Aug 28 2015 Eric D. Helms 1.0.1-4 -- Update rubygem-hammer_cli_gutterball to tfm SCL (ericdhelms@gmail.com) - -* Fri Jul 31 2015 Eric D. Helms 1.0.1-3 -- Fixes #11259: Move hammer packages to SCL (ericdhelms@gmail.com) - -* Wed Jul 29 2015 Eric D. Helms 1.0.1-2 -- new package built with tito - -* Tue Mar 03 2015 Adam Price 1.0.0-1 -- new package built with tito -