From 3b50a70cf8d48f31a3b3377113c1ed0e3b83e749 Mon Sep 17 00:00:00 2001 From: Leah Leshchinsky Date: Thu, 13 Jan 2022 15:37:29 +0000 Subject: [PATCH] Rebase to upstream version 0.17 --- tuna-Fix-ModuleNotFoundError.patch | 35 ++++++++++++++++++++++++++++++ tuna.spec | 8 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tuna-Fix-ModuleNotFoundError.patch diff --git a/tuna-Fix-ModuleNotFoundError.patch b/tuna-Fix-ModuleNotFoundError.patch new file mode 100644 index 0000000..7b5cc20 --- /dev/null +++ b/tuna-Fix-ModuleNotFoundError.patch @@ -0,0 +1,35 @@ +From 7684169d22af5379d2f466730c450afc92e80da8 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Tue, 11 Jan 2022 16:58:58 -0500 +Subject: [PATCH] tuna: Fix ModuleNotFoundError + +commit 43b434867514934593ada5aa8ea448ef6a1778f9 fixed the problem with +relative imports but unfortunately created a new problem with installed +tuna + +This fixes the original problem and also fixes the ModuleNotFoundError +in an installed (not running from git) version of tuna. + +Signed-off-by: John Kacur +--- + tuna/tuna.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tuna/tuna.py b/tuna/tuna.py +index 98a1725598dd..8fb42121e2e4 100755 +--- a/tuna/tuna.py ++++ b/tuna/tuna.py +@@ -12,8 +12,8 @@ import platform + import ethtool + import procfs + from procfs import utilist +-import help +-import tuna_sched ++from tuna import help ++from tuna import tuna_sched + + try: + fntable +-- +2.27.0 + diff --git a/tuna.spec b/tuna.spec index dc4bfd5..061a2f7 100644 --- a/tuna.spec +++ b/tuna.spec @@ -1,6 +1,6 @@ Name: tuna Version: 0.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Summary: Application tuning GUI & command line utility URL: https://git.kernel.org/pub/scm/utils/tuna/tuna.git @@ -14,6 +14,7 @@ Requires: python3-linux-procfs >= 0.6 # Requires: python-inet_diag # Patches +Patch1: tuna-Fix-ModuleNotFoundError.patch %description Provides interface for changing scheduler and IRQ tunables, at whole CPU and at @@ -26,6 +27,7 @@ installed. %prep %setup -q +%patch1 -p1 %build %py3_build @@ -67,6 +69,10 @@ done %{_datadir}/polkit-1/actions/org.tuna.policy %changelog +* Thu Jan 13 2022 Leah Leshchinsky - 0.17-2 +- Fix ModuleNotFoundError +Resolves: rhbz#2012307 + * Tue Jan 11 2022 Leah Leshchinsky - 0.17-1 - Rebase to upstream version 0.17 Resolves: rhbz#2012307