From 0d5b15e8da1b7edc147c8a54fc7ceb4dc7985116 Mon Sep 17 00:00:00 2001
From: Jiri Kastner <jkastner@redhat.com>
Date: Tue, 12 Feb 2019 16:08:43 +0100
Subject: [PATCH] oscilloscope gtk3 patch

---
 .gitignore                                    |  1 +
 ...show_thread-call-with-bad-args-count.patch | 26 -----------
 sources                                       |  2 +-
 tuna.spec                                     | 45 +++++++++++--------
 4 files changed, 28 insertions(+), 46 deletions(-)
 delete mode 100644 0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch

diff --git a/.gitignore b/.gitignore
index 2f5cf08..9a5990f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tuna-0.11.1.tar.bz2
 /tuna-0.12.tar.xz
 /tuna-0.13.1.tar.xz
+/tuna-0.14.tar.xz
diff --git a/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch b/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch
deleted file mode 100644
index 7c0c6e2..0000000
--- a/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9367460e6281f9366d7f3919279f28625a6a6299 Mon Sep 17 00:00:00 2001
-From: Petr Oros <poros@redhat.com>
-Date: Thu, 15 Aug 2013 11:15:45 +0200
-Subject: [PATCH] CLI: fix ps_show_thread call with bad args count
-
-Signed-off-by: Petr Oros <poros@redhat.com>
----
- tuna-cmd.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tuna-cmd.py b/tuna-cmd.py
-index 64e3ad1..5dcc181 100755
---- a/tuna-cmd.py
-+++ b/tuna-cmd.py
-@@ -227,7 +227,7 @@ def ps_show_thread(pid, affect_children, ps,
- 		for tid in ps[pid]["threads"].keys():
- 			ps_show_thread(tid, False, ps[pid]["threads"],
- 				       has_ctxt_switch_info,
--				       sock_inodes, sock_inode_re)
-+				       sock_inodes, sock_inode_re, cgroups)
- 			
- 
- def ps_show(ps, affect_children, thread_list, cpu_list,
--- 
-1.8.3.1
-
diff --git a/sources b/sources
index c14cd77..13672b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tuna-0.13.1.tar.xz) = 7a92b79b1bac6c5089e79abf517fc4c554760228291642dd7e0027ccad2314bd4f1bb78f2b12878a188f5c6b82c66a580cec80511d8b935fd795d9b0b5627914
+SHA512 (tuna-0.14.tar.xz) = a0d9eff7b14803ff48c485186924cd6a4fa9bacb5059b9aa23095f1f9ff3d274ed1c1e1487825fd1ff4884986d387688707c9fda153178e8b7f2883406e78a59
diff --git a/tuna.spec b/tuna.spec
index 7c506fe..8cfeab5 100644
--- a/tuna.spec
+++ b/tuna.spec
@@ -1,18 +1,16 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}
-
 Name: tuna
-Version: 0.13.1
-Release: 8%{?dist}
+Version: 0.14
+Release: 2%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 Source: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
+Patch0: oscilloscope-move-from-pygtk2-to-gtk3-gobject.patch
 URL: https://rt.wiki.kernel.org/index.php/Tuna
 BuildArch: noarch
-BuildRequires: python2-devel, gettext
-Requires: python2-ethtool
-Requires: python2-linux-procfs >= 0.4.5
-Requires: python2-schedutils >= 0.2
+BuildRequires: python3-devel, gettext
+Requires: python3-ethtool
+Requires: python3-linux-procfs >= 0.6
+Requires: python3-schedutils >= 0.6
 # This really should be a Suggests...
 # Requires: python-inet_diag
 
@@ -27,10 +25,10 @@ installed.
 
 %package -n oscilloscope
 Summary: Generic graphical signal plotting tool
-Requires: python2-matplotlib
-Requires: python2-matplotlib-gtk
-Requires: python2-numpy
-Requires: pygtk2
+Requires: python3-matplotlib-gtk3
+Requires: python3-numpy
+Requires: python3-cairocffi
+Requires: gobject-introspection
 Requires: tuna = %{version}-%{release}
 
 %description -n oscilloscope
@@ -43,13 +41,17 @@ priority is changed, be it using tuna or plain chrt & taskset.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%py2_build
+%py3_build
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tuna/
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tuna-cmd.py
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" oscilloscope-cmd.py
 
 %install
 rm -rf %{buildroot}
-%py2_install
+%py3_install
 mkdir -p %{buildroot}/%{_sysconfdir}/tuna/
 mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads,%{_mandir}/man8}
 mkdir -p %{buildroot}/%{_datadir}/polkit-1/actions/
@@ -73,12 +75,10 @@ done
 
 %files -f %{name}.lang
 %doc ChangeLog
-%if "%{python_ver}" >= "2.5"
-%{python2_sitelib}/*.egg-info
-%endif
+%{python3_sitelib}/*.egg-info
 %{_bindir}/tuna
 %{_datadir}/tuna/
-%{python2_sitelib}/tuna/
+%{python3_sitelib}/tuna/
 %{_mandir}/man8/tuna.8*
 %{_sysconfdir}/tuna.conf
 %{_sysconfdir}/tuna/*
@@ -90,6 +90,13 @@ done
 %doc docs/oscilloscope+tuna.pdf
 
 %changelog
+* Tue Feb 12 2019 Jiri Kastner <jkastner@fedoraproject.org> - 0.14-2
+- oscilloscope gtk3 patch
+
+* Tue Feb 12 2019 Jiri Kastner <jkastner@fedoraproject.org> - 0.14-1
+- update to 0.14
+- switch to python3
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild