From 13b9caca55b968d26f5e343668a6f37ef475cc9b Mon Sep 17 00:00:00 2001
From: Leah Leshchinsky <lleshchi@redhat.com>
Date: Wed, 29 Jun 2022 15:52:51 +0000
Subject: [PATCH] Rebase to upstream version 0.18

---
 .gitignore |  1 +
 sources    |  2 +-
 tuna.spec  | 20 ++++++--------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index b37e56d..255d405 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /tuna-0.15.tar.xz
 /tuna-0.16.tar.xz
 /tuna-0.17.tar.xz
+/tuna-0.18.tar.xz
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 efa2a51..9f61f38 100644
--- a/tuna.spec
+++ b/tuna.spec
@@ -1,6 +1,6 @@
 Name: tuna
-Version: 0.17
-Release: 4%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 URL: https://git.kernel.org/pub/scm/utils/tuna/tuna.git
@@ -14,12 +14,6 @@ Requires: python3-linux-procfs >= 0.6
 # Requires: python-inet_diag
 
 # Patches
-Patch1: tuna-Fix-ModuleNotFoundError.patch
-Patch2: tuna-Fix-typo-for-variable-parm.patch
-Patch3: tuna-Handle-get_policy_and_rtprio-exceptions.patch
-Patch4: tuna-Remove-finally-block-in-get_policy_and_rtprio.patch
-Patch5: tuna-Add-logging-infrastructure-to-tuna-cmd.patch
-Patch6: tuna-Add-cleanlogs-rule-to-Makefile.patch
 
 %description
 Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
@@ -32,12 +26,6 @@ installed.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %py3_build
@@ -79,6 +67,10 @@ done
 %{_datadir}/polkit-1/actions/org.tuna.policy
 
 %changelog
+* Wed Jun 29 2022 Leah Leshchinsky <lleshchi@redhat.com> - 0.18-1
+- Update to latest upstream tuna-0.18
+Resolves: rhbz#2068629
+
 * Wed May 11 2022 Leah Leshchinsky <lleshchi@redhat.com> - 0.17-4
 - Add logging infrastructure to tuna cmd
 - Add cleanlogs rule to Makefile