diff --git a/.gitignore b/.gitignore index b2892aa..d6e69ed 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /tuna-0.14.1.tar.xz /tuna-0.16.tar.xz /tuna-0.17.tar.xz +/tuna-0.18.tar.xz diff --git a/fix-ModuleNotFoundError.patch b/fix-ModuleNotFoundError.patch deleted file mode 100644 index e0a5b5f..0000000 --- a/fix-ModuleNotFoundError.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7684169d22af5379d2f466730c450afc92e80da8 Mon Sep 17 00:00:00 2001 -From: John Kacur -Date: Tue, 11 Jan 2022 16:58:58 -0500 -Subject: 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 98a1725..8fb4212 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 --- -cgit 1.2.3-1.el7 - diff --git a/sources b/sources index 39e34cc..cd14d9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tuna-0.17.tar.xz) = e04bb56415e702e888d7022342e34bdff19fe978e13793e737613baf48eadcd1b926d414ec8ba5205c9bea4622bf44b9b12e1fe33e1a89b467bd84e17c4643c4 +SHA512 (tuna-0.18.tar.xz) = f05774a030f6b41a262fbe28fba2516763bddfdd1bd4ae1ed925cf3852397231af94571b857952466e87f73a33c4111afb53009faa8ed0fde12db4be1788ada7 diff --git a/tuna.spec b/tuna.spec index fd54031..083c2e4 100644 --- a/tuna.spec +++ b/tuna.spec @@ -1,10 +1,9 @@ Name: tuna -Version: 0.17 -Release: 4%{?dist} +Version: 0.18 +Release: 1%{?dist} License: GPLv2 Summary: Application tuning GUI & command line utility Source: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz -Patch0: fix-ModuleNotFoundError.patch URL: https://rt.wiki.kernel.org/index.php/Tuna BuildArch: noarch BuildRequires: python3-devel, gettext @@ -41,7 +40,6 @@ priority is changed, be it using tuna or plain chrt & taskset. %prep %setup -q -%patch0 -p1 %build %py3_build @@ -90,6 +88,9 @@ done %doc docs/oscilloscope+tuna.pdf %changelog +* Fri Aug 12 2022 Federico Pellegrin - 0.18-1 +- update to 0.18, remove now merged patch + * Sat Jul 23 2022 Fedora Release Engineering - 0.17-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild