Skip to content

Commit

Permalink
Bump to katello-host-tools 4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sbernhard committed May 10, 2024
1 parent 91b0f85 commit 780ffd1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 26 deletions.

This file was deleted.

39 changes: 14 additions & 25 deletions packages/client/katello-host-tools/katello-host-tools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
%global katello_libdir %{python_libdir}/katello

Name: katello-host-tools
Version: 4.2.3
Release: 6%{?dist}
Version: 4.4.0
Release: 1%{?dist}
Summary: A set of commands and yum plugins that support a Katello host
Group: Development/Languages
%if 0%{?suse_version}
Expand Down Expand Up @@ -161,16 +161,11 @@ Adds Tracer functionality to a client managed by katello-host-tools
%setup -q

%build
# Remove apt bits
rm -r src/apt_plugins
rm src/katello/deb_tracer.py
rm -f src/katello/tracer/deb.py

%if !%{dnf_install}
rm -r src/dnf_plugins
%else
# 'Hack' for the fact that dnf recognizes plugins in 'dnf-plugins'
# can be removed when we update to a release that contains https://github.com/Katello/katello-host-tools/pull/145
mv src/dnf_plugins src/dnf-plugins
%endif

%if !%{yum_install}
Expand All @@ -179,7 +174,7 @@ rm -r src/yum-plugins

%if !%{zypper_install}
rm -r src/zypper_plugins
rm src/katello/zypper_tracer.py
rm -f src/katello/tracer/zypper.py
%endif

%if %{build_tracer}
Expand All @@ -188,9 +183,9 @@ rm src/katello/zypper_tracer.py
sed -i '/katello-tracer-upload=katello.scripts:tracer_upload/d' src/setup.py
%endif
%else
rm src/katello/tracer.py
rm -r src/katello/tracer
sed -i '/katello-tracer-upload=katello.scripts:tracer_upload/d' src/setup.py
rm etc/yum/pluginconf.d/tracer_upload.conf
rm -f etc/yum/pluginconf.d/tracer_upload.conf
%endif

%if %{build_agent}
Expand Down Expand Up @@ -333,20 +328,11 @@ exit 0
%endif

%if %{build_tracer}
# TODO pycached unavailable on SuSE - what to do with cache files?
%if %{zypper_install}
%exclude %{katello_libdir}/tracer.py
%else
%if %{yum_install}
%exclude %{katello_libdir}/tracer.py*
%else
%pycached %exclude %{katello_libdir}/tracer.py
%endif
%endif

%if %{dnf_install}
%pycached %exclude %{katello_libdir}/tracer/*.py
%pycached %exclude %{plugins_dir}/__init__.py
%else
%exclude %{katello_libdir}/tracer
%exclude %{plugins_dir}
%endif
%endif
Expand All @@ -362,6 +348,8 @@ exit 0
%if %{zypper_install}
%dir %{_sysconfdir}/yum
%dir %{plugins_confdir}
%{plugins_dir}/package_upload.py
%{plugins_dir}/enabled_repos_upload.py
%exclude %{python_libdir}/zypper_plugins
%endif

Expand All @@ -379,27 +367,28 @@ exit 0
%files tracer
%defattr(-,root,root,-)
%if %{zypper_install}
%{katello_libdir}/tracer.py
%dir %{_usr}/lib/zypp
%dir %{_usr}/lib/zypp/plugins
%dir %{plugins_dir}
%{plugins_dir}/tracer_upload.py
%else
%if %{yum_install}
%{katello_libdir}/tracer.py*
%{plugins_dir}/tracer_upload.py*
%else
%pycached %{katello_libdir}/tracer.py
%pycached %{plugins_dir}/tracer_upload.py
%endif
%endif
%{katello_libdir}/tracer
%{plugins_confdir}/tracer_upload.conf
%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/cron.d/katello-tracer-upload
%attr(750, root, root) %{_sbindir}/katello-tracer-upload
%endif


%changelog
* Fri May 10 2024 Bernhard Suttner <suttner@atix.de> - 4.4.0-1
- Update to 4.4.0 (Based on the work of wbclark and ianballou)

* Tue Apr 09 2024 Evgeni Golov - 4.2.3-6
- Don't install package and repository upload on DNF installs

Expand Down

0 comments on commit 780ffd1

Please sign in to comment.