Adjustments I will rebase afterwards

theforeman · Jun 21, 2024 · 9e777d7 · 9e777d7
1 parent f6ad6c6
commit 9e777d7
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/packages/client/katello-host-tools/katello-host-tools.spec b/packages/client/katello-host-tools/katello-host-tools.spec
@@ -57,10 +57,6 @@ Requires: subscription-manager
 Obsoletes: %{name}-fact-plugin < %{version}-%{release}
 Obsoletes: katello-agent < %{version}-%{release}
 
-%if %{dnf_install}
-Requires: python3-psutil
-%endif
-
 %if %{dnf_install} || 0%{?suse_version} >= 1500
 Requires: python3-subscription-manager-rhsm
 %else
@@ -110,6 +106,9 @@ Requires: crontabs
 %if %{yum_install}
 Requires: python2-tracer >= 0.6.12
 %endif
+%if %{dnf_install}
+Requires: python3-psutil
+%endif
 
 %description tracer
 Adds Tracer functionality to a client managed by katello-host-tools
@@ -125,6 +124,7 @@ rm -f src/katello/tracer/deb.py
 %if !%{dnf_install}
 rm -r src/dnf-plugins
 rm -f src/katello/tracer/dnf.py
+rm -f src/katello/tracer/SystemdDbus.py
 %endif
 
 %if !%{yum_install}
@@ -237,15 +237,9 @@ exit 0
 %exclude %{katello_libdir}/contrib
 
 %if %{build_tracer}
-%if %{dnf_install}
-%pycached %exclude %{katello_libdir}/tracer/*.py
-%exclude %{katello_libdir}/tracer/__pycache__
-%pycached %exclude %{plugins_dir}/__init__.py
-%else
 %exclude %{katello_libdir}/tracer
 %exclude %{plugins_dir}
 %endif
-%endif
 
 %if %{yum_install} || %{zypper_install}
 %attr(750, root, root) %{_sbindir}/katello-package-upload