diff --git a/0001-Switch-from-python-to-python3.patch b/0001-Switch-from-python-to-python3.patch deleted file mode 100644 index 3758b890f8d6abc87ceb9a5567248d7048b6c7a7..0000000000000000000000000000000000000000 --- a/0001-Switch-from-python-to-python3.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7d6b10b118a8164ef8a924a0c131b2a062349fd3 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Sun, 29 Apr 2018 11:40:58 +0800 -Subject: [PATCH 01/11] Switch from python to python3 - -Python 2 will be EOL in 2020 so Python 3 is preferrable. - -See-also: https://pythonclock.org/ ---- - iotop.py | 2 +- - sbin/iotop | 2 +- - setup.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/iotop.py b/iotop.py -index 13ed873..666c6b4 100755 ---- a/iotop.py -+++ b/iotop.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # iotop: Display I/O usage of processes in a top like UI - # Copyright (c) 2007, 2008 Guillaume Chazarain - # GPL version 2 or later -diff --git a/sbin/iotop b/sbin/iotop -index c5202d3..bb23a6e 100755 ---- a/sbin/iotop -+++ b/sbin/iotop -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # iotop: Display I/O usage of processes in a top like UI - # Copyright (c) 2007, 2008 Guillaume Chazarain , GPLv2 - # See iotop --help for some help -diff --git a/setup.py b/setup.py -index cd639ca..c63a36e 100755 ---- a/setup.py -+++ b/setup.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from distutils.core import setup - from distutils.command import install as distutils_install --- -1.8.3.1 - diff --git a/0002-Fix-build-error-with-Python-3-caused-by-itervalues-i.patch b/0002-Fix-build-error-with-Python-3-caused-by-itervalues-i.patch deleted file mode 100644 index 9ed068fcafa9e5d1d1ef99c0466ffc264664fc64..0000000000000000000000000000000000000000 --- a/0002-Fix-build-error-with-Python-3-caused-by-itervalues-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 435bbde65bd10aa2ecbd352f46bb7f0abddc2189 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Fri, 17 Oct 2014 13:49:31 +0200 -Subject: [PATCH 02/11] Fix build error with Python 3 caused by itervalues() in - setup.py - -The itervalues() method is not available in Python 3. As a -consequence, this patch replaces the call to itervalues() in setup.py -with a call to values() which works on both Python 2 and Python 3. - -Signed-off-by: Christophe Vu-Brugier -Signed-off-by: Paul Wise ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index c63a36e..a73423d 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ from iotop.version import VERSION - # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/ - # while still honoring the choice of installing into local/ or not. - if hasattr(distutils_install, 'INSTALL_SCHEMES'): -- for d in distutils_install.INSTALL_SCHEMES.itervalues(): -+ for d in distutils_install.INSTALL_SCHEMES.values(): - if d.get('scripts', '').endswith('/bin'): - d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin' - --- -1.8.3.1 - diff --git a/0003-Only-split-proc-status-lines-on-the-character.patch b/0003-Only-split-proc-status-lines-on-the-character.patch deleted file mode 100644 index 66dcb2992f06272c7c5afd955f6c52e18e586a1f..0000000000000000000000000000000000000000 --- a/0003-Only-split-proc-status-lines-on-the-character.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 961bd1671afbf501251119cdd7c02ce8cdaa7446 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Thu, 28 Jul 2016 13:25:54 +0800 -Subject: [PATCH 03/11] Only split /proc/*/status lines on the : character. - -Apparently vserver kernels have some lines that don't -appear to have the tab character so iotop crashes. - -The tab character will be stripped by the next code line. - -Closes: https://bugs.gentoo.org/show_bug.cgi?id=458556 ---- - iotop/data.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iotop/data.py b/iotop/data.py -index 25b659e..bf2e7b5 100644 ---- a/iotop/data.py -+++ b/iotop/data.py -@@ -193,7 +193,7 @@ def parse_proc_pid_status(pid): - result_dict = {} - try: - for line in open('/proc/%d/status' % pid): -- key, value = line.split(':\t', 1) -+ key, value = line.split(':', 1) - result_dict[key] = value.strip() - except IOError: - pass # No such process --- -1.8.3.1 - diff --git a/0004-Ignore-invalid-lines-in-proc-status-files.patch b/0004-Ignore-invalid-lines-in-proc-status-files.patch deleted file mode 100644 index a636ab4ba107a0553ee40f19700cb08644788d0c..0000000000000000000000000000000000000000 --- a/0004-Ignore-invalid-lines-in-proc-status-files.patch +++ /dev/null @@ -1,64 +0,0 @@ -From bd9396b2003a57077d2e7ca0b4b510537a24075c Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Fri, 25 May 2018 15:13:26 +0800 -Subject: [PATCH 04/11] Ignore invalid lines in /proc/*/status files - -One Ubuntu Linux kernel security fix introduced a blank line. -Some other Linux kernels may have invalid lines in the future. - -See-also: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1772671 -Fixes: https://bugs.launchpad.net/ubuntu/+source/iotop/+bug/1772856 -Reported-by: Paul Jaros -Reported-in: -Traceback (most recent call last): - File "/usr/sbin/iotop", line 17, in - main() - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 620, in main - main_loop() - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 610, in - main_loop = lambda: run_iotop(options) - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 508, in run_iotop - return curses.wrapper(run_iotop_window, options) - File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper - return func(stdscr, *args, **kwds) - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 501, in run_iotop_window - ui.run() - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 155, in run - self.process_list.duration) - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 434, in refresh_display - lines = self.get_data() - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 415, in get_data - return list(map(format, processes)) - File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 388, in format - cmdline = p.get_cmdline() - File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 292, in get_cmdline - proc_status = parse_proc_pid_status(self.pid) - File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 196, in parse_proc_pid_status - key, value = line.split(':\t', 1) -ValueError: need more than 1 value to unpack ---- - iotop/data.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/iotop/data.py b/iotop/data.py -index bf2e7b5..62626c3 100644 ---- a/iotop/data.py -+++ b/iotop/data.py -@@ -193,7 +193,13 @@ def parse_proc_pid_status(pid): - result_dict = {} - try: - for line in open('/proc/%d/status' % pid): -- key, value = line.split(':', 1) -+ try: -+ key, value = line.split(':', 1) -+ except ValueError: -+ # Ignore lines that are not formatted correctly as -+ # some downstream kernels may have weird lines and -+ # the needed fields are probably formatted correctly. -+ pass - result_dict[key] = value.strip() - except IOError: - pass # No such process --- -1.8.3.1 - diff --git a/0005-Actually-skip-invalid-lines-in-proc-status.patch b/0005-Actually-skip-invalid-lines-in-proc-status.patch deleted file mode 100644 index 33236deb555a54565cedc050e306cc4a9a7c2a2c..0000000000000000000000000000000000000000 --- a/0005-Actually-skip-invalid-lines-in-proc-status.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a196e5a7f4c0cb694597a5c354ec12e6b262e570 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Fri, 25 May 2018 15:20:44 +0800 -Subject: [PATCH 05/11] Actually skip invalid lines in /proc/*/status - -Actually skip invalid lines in /proc/*/status - -Fixes: commit 0392b205b5c3973a326721c2e9f97f0fa2eefa82 ---- - iotop/data.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iotop/data.py b/iotop/data.py -index 62626c3..8378e51 100644 ---- a/iotop/data.py -+++ b/iotop/data.py -@@ -199,7 +199,7 @@ def parse_proc_pid_status(pid): - # Ignore lines that are not formatted correctly as - # some downstream kernels may have weird lines and - # the needed fields are probably formatted correctly. -- pass -+ continue - result_dict[key] = value.strip() - except IOError: - pass # No such process --- -1.8.3.1 - diff --git a/0006-replace-powerpc-with-ppc-in-ioprio.py.patch b/0006-replace-powerpc-with-ppc-in-ioprio.py.patch index 27e1f0571ee8f2f085fd5f3ad4c73a21aa207fa3..cd58a009ac1161372e87d75d9e93290622c562fb 100644 --- a/0006-replace-powerpc-with-ppc-in-ioprio.py.patch +++ b/0006-replace-powerpc-with-ppc-in-ioprio.py.patch @@ -14,18 +14,18 @@ diff --git a/iotop/ioprio.py b/iotop/ioprio.py index 85957fd..a624795 100644 --- a/iotop/ioprio.py +++ b/iotop/ioprio.py -@@ -32,7 +32,7 @@ IOPRIO_GET_ARCH_SYSCALL = [ - ('i*86', '*', 290), - ('ia64*', '*', 1275), +@@ -33,7 +33,7 @@ IOPRIO_GET_ARCH_SYSCALL = [ + ('mips*', '32bit', 4315), + ('mips*', '64bit', 5274), ('parisc*', '*', 268), - ('powerpc*', '*', 274), + ('ppc*', '*', 274), ('s390*', '*', 283), ('sparc*', '*', 218), ('sh*', '*', 289), -@@ -46,7 +46,7 @@ IOPRIO_SET_ARCH_SYSCALL = [ - ('i*86', '*', 289), - ('ia64*', '*', 1274), +@@ -49,7 +49,7 @@ IOPRIO_SET_ARCH_SYSCALL = [ + ('mips*', '32bit', 4314), + ('mips*', '64bit', 5273), ('parisc*', '*', 267), - ('powerpc*', '*', 273), + ('ppc*', '*', 273), diff --git a/0008-Print-the-titles-at-specific-locations.patch b/0008-Print-the-titles-at-specific-locations.patch deleted file mode 100644 index 58437a513bdfeabccea37ca0b0564cdc7a369231..0000000000000000000000000000000000000000 --- a/0008-Print-the-titles-at-specific-locations.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8b0d74472fccdff449bf83d7624df0867df83344 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Thu, 4 Aug 2016 17:28:57 +0800 -Subject: [PATCH 08/11] Print the titles at specific locations - -Prevents a crash in a 3-line terminal: - -Traceback (most recent call last): - File "./iotop.py", line 12, in - main() - File "./iotop/ui.py", line 652, in main - main_loop() - File "./iotop/ui.py", line 642, in - main_loop = lambda: run_iotop(options) - File "./iotop/ui.py", line 537, in run_iotop - return curses.wrapper(run_iotop_window, options) - File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper - return func(stdscr, *args, **kwds) - File "./iotop/ui.py", line 529, in run_iotop_window - ui.run() - File "./iotop/ui.py", line 176, in run - self.process_list.duration) - File "./iotop/ui.py", line 492, in refresh_display - self.win.addstr(title, attr) -_curses.error: addstr() returned ERR ---- - iotop/ui.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/iotop/ui.py b/iotop/ui.py -index e033c92..848c42b 100644 ---- a/iotop/ui.py -+++ b/iotop/ui.py -@@ -452,6 +452,7 @@ class IOTopUI(object): - self.win.addstr(i, 0, s[:self.width]) - self.win.hline(len(summary), 0, ord(' ') | curses.A_REVERSE, - self.width) -+ pos = 0 - remaining_cols = self.width - for i in range(len(titles)): - attr = curses.A_REVERSE -@@ -463,7 +464,8 @@ class IOTopUI(object): - title += self.sorting_reverse and '>' or '<' - title = title[:remaining_cols] - remaining_cols -= len(title) -- self.win.addstr(title, attr) -+ self.win.addstr(len(summary), pos, title, attr) -+ pos += len(title) - if Stats.has_blkio_delay_total: - status_msg = None - else: --- -1.8.3.1 - diff --git a/0009-Improve-the-message-that-is-printed-when-Linux-tasks.patch b/0009-Improve-the-message-that-is-printed-when-Linux-tasks.patch deleted file mode 100644 index 10964e955eca3a9711ea6749186d6213b050cbb2..0000000000000000000000000000000000000000 --- a/0009-Improve-the-message-that-is-printed-when-Linux-tasks.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f079550490496eb1008fe73620ab5db3bd4a99a8 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Thu, 3 May 2018 11:06:09 +0800 -Subject: [PATCH 09/11] Improve the message that is printed when Linux - taskstats are not found - -Usually this means that iotop is being run in a container. -The Linux kernel doesn't support taskstats outside the host net namespace. -There was a patch that looks like it may fix this but it never got merged. - -Traceback (most recent call last): - File "/usr/sbin/iotop", line 17, in - main() - File "/usr/lib/python3/dist-packages/iotop/ui.py", line 737, in main - main_loop() - File "/usr/lib/python3/dist-packages/iotop/ui.py", line 727, in - main_loop = lambda: run_iotop(options) - File "/usr/lib/python3/dist-packages/iotop/ui.py", line 618, in run_iotop - return run_iotop_window(None, options) - File "/usr/lib/python3/dist-packages/iotop/ui.py", line 609, in run_iotop_window - taskstats_connection = TaskStatsNetlink(options) - File "/usr/lib/python3/dist-packages/iotop/data.py", line 151, in __init__ - self.family_id = controller.get_family_id('TASKSTATS') - File "/usr/lib/python3/dist-packages/iotop/genetlink.py", line 76, in get_family_id - m = GeNlMessage.recv(self.conn) - File "/usr/lib/python3/dist-packages/iotop/genetlink.py", line 56, in recv - msg = conn.recv() - File "/usr/lib/python3/dist-packages/iotop/netlink.py", line 255, in recv - raise err -OSError: Netlink error: No such file or directory (2) - -See-also: https://blog.outlyer.com/using-netlink-to-calculate-load-averages -See-also: https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg924689.html -See-also: https://bugzilla.redhat.com/show_bug.cgi?id=1290691 -See-also: https://bugs.openvz.org/browse/OVZ-5655 ---- - iotop/ui.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/iotop/ui.py b/iotop/ui.py -index 848c42b..328dafe 100644 ---- a/iotop/ui.py -+++ b/iotop/ui.py -@@ -520,6 +520,15 @@ configure sudo to allow you to run iotop as root. - - Please do not file bugs on iotop about this.''', file=sys.stderr) - sys.exit(1) -+ if e.errno == errno.ENOENT: -+ print(e, file=sys.stderr) -+ print(''' -+The Linux kernel interfaces that iotop relies on for process I/O statistics -+were not found. Please enable CONFIG_TASKSTATS in your Linux kernel build -+configuration, use iotop outside a container and or share the host's -+network namespace with the container. -+ -+Please do not file bugs on iotop about this.''', file=sys.stderr - else: - raise - --- -1.8.3.1 - diff --git a/0010-Fix-crash-due-to-syntax-error.patch b/0010-Fix-crash-due-to-syntax-error.patch deleted file mode 100644 index f76cc6a305458602faec90f3009c129d6186670d..0000000000000000000000000000000000000000 --- a/0010-Fix-crash-due-to-syntax-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cfdcabc05f75fbc5680608ef9c27069aa75077f6 Mon Sep 17 00:00:00 2001 -From: Paul Jaros -Date: Thu, 24 May 2018 18:47:00 +0800 -Subject: [PATCH 10/11] Fix crash due to syntax error - -Traceback (most recent call last): - File "./iotop.py", line 9, in - from iotop.ui import main - File "./iotop/ui.py", line 642 - else: - ^ -SyntaxError: invalid syntax - -Reported-in: ---- - iotop/ui.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iotop/ui.py b/iotop/ui.py -index 328dafe..40e9a40 100644 ---- a/iotop/ui.py -+++ b/iotop/ui.py -@@ -528,7 +528,7 @@ were not found. Please enable CONFIG_TASKSTATS in your Linux kernel build - configuration, use iotop outside a container and or share the host's - network namespace with the container. - --Please do not file bugs on iotop about this.''', file=sys.stderr -+Please do not file bugs on iotop about this.''', file=sys.stderr) - else: - raise - --- -1.8.3.1 - diff --git a/0011-Use-monotonic-time-to-calculate-durations.patch b/0011-Use-monotonic-time-to-calculate-durations.patch deleted file mode 100644 index 4a4841eb40374be1bad7dc275b86c48deefab577..0000000000000000000000000000000000000000 --- a/0011-Use-monotonic-time-to-calculate-durations.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a535dc4f25f65379bf81f947307d92eee1618e54 Mon Sep 17 00:00:00 2001 -From: Paul Wise -Date: Thu, 4 May 2017 21:23:22 +0800 -Subject: [PATCH 11/11] Use monotonic time to calculate durations - -Prevents incorrect calculations when the system time is set backwards. - -Reported-by: Andrei Costin -Fixes: https://bugs.launchpad.net/bugs/1685512 ---- - iotop/data.py | 6 +++--- - iotop/ui.py | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/iotop/data.py b/iotop/data.py -index 8378e51..befa9c7 100644 ---- a/iotop/data.py -+++ b/iotop/data.py -@@ -248,7 +248,7 @@ class ProcessInfo(DumpableObject): - self.threads = {} # {tid: ThreadInfo} - self.stats_delta = Stats.build_all_zero() - self.stats_accum = Stats.build_all_zero() -- self.stats_accum_timestamp = time.time() -+ self.stats_accum_timestamp = time.monotonic() - - def is_monitored(self, options): - if (options.pids and not options.processes and -@@ -373,7 +373,7 @@ class ProcessList(DumpableObject): - self.processes = {} - self.taskstats_connection = taskstats_connection - self.options = options -- self.timestamp = time.time() -+ self.timestamp = time.monotonic() - self.vmstat = vmstat.VmStat() - - # A first time as we are interested in the delta -@@ -423,7 +423,7 @@ class ProcessList(DumpableObject): - return tids - - def update_process_counts(self): -- new_timestamp = time.time() -+ new_timestamp = time.monotonic() - self.duration = new_timestamp - self.timestamp - self.timestamp = new_timestamp - -diff --git a/iotop/ui.py b/iotop/ui.py -index 40e9a40..abd6b79 100644 ---- a/iotop/ui.py -+++ b/iotop/ui.py -@@ -70,7 +70,7 @@ def format_stats(options, process, duration): - if options.accumulated: - stats = process.stats_accum - display_format = lambda size, duration: format_size(options, size) -- duration = time.time() - process.stats_accum_timestamp -+ duration = time.monotonic() - process.stats_accum_timestamp - else: - stats = process.stats_delta - display_format = lambda size, duration: format_bandwidth( --- -1.8.3.1 - diff --git a/0012-riscv-Add-riscv64-support.patch b/0012-riscv-Add-riscv64-support.patch deleted file mode 100644 index 612f38a4fc377305d517eb53f2210ca5f9668599..0000000000000000000000000000000000000000 --- a/0012-riscv-Add-riscv64-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 79a1955551c06966370cc9fee4cec381de27eb54 Mon Sep 17 00:00:00 2001 -From: Mingzheng Xing -Date: Sun, 17 Sep 2023 21:59:48 +0800 -Subject: [PATCH] riscv: Add riscv64 support - -Signed-off-by: Mingzheng Xing ---- - iotop/ioprio.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iotop/ioprio.py b/iotop/ioprio.py -index d292add..ba804c8 100644 ---- a/iotop/ioprio.py -+++ b/iotop/ioprio.py -@@ -34,6 +34,7 @@ IOPRIO_GET_ARCH_SYSCALL = [ - ('ia64*', '*', 1275), - ('parisc*', '*', 268), - ('ppc*', '*', 274), -+ ('riscv64', '*', 31), - ('s390*', '*', 283), - ('sparc*', '*', 218), - ('sh*', '*', 289), -@@ -49,6 +50,7 @@ IOPRIO_SET_ARCH_SYSCALL = [ - ('ia64*', '*', 1274), - ('parisc*', '*', 267), - ('ppc*', '*', 273), -+ ('riscv64', '*', 30), - ('s390*', '*', 282), - ('sparc*', '*', 196), - ('sh*', '*', 288), --- -2.23.0 - diff --git a/iotop-0.6.tar.bz2 b/iotop-0.6.tar.bz2 deleted file mode 100644 index cfbb25ef72e2b94e2f98d69377413b85c42dbed5..0000000000000000000000000000000000000000 Binary files a/iotop-0.6.tar.bz2 and /dev/null differ diff --git a/iotop-0.6^20240204git4b2e1aa2.tar.bz2 b/iotop-0.6^20240204git4b2e1aa2.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..0df268e3b858f94e4781e13e4588e25974aa5e82 Binary files /dev/null and b/iotop-0.6^20240204git4b2e1aa2.tar.bz2 differ diff --git a/iotop.spec b/iotop.spec index 57985a3252d349d5d010ebed9f654faaf0cb1305..d5818111ceec3e8eb56db6950b53eb9d3a4eaa3e 100644 --- a/iotop.spec +++ b/iotop.spec @@ -1,27 +1,16 @@ Name: iotop -Version: 0.6 -Release: 25 +Version: 0.6^20240204git4b2e1aa2 +Release: 1 Summary: Simple top-like I/O monitor License: GPLv2+ URL: http://guichaz.free.fr/iotop/ Source0: http://guichaz.free.fr/iotop/files/%{name}-%{version}.tar.bz2 -BuildArch: noarch -BuildRequires: python3-devel +BuildRequires: python3-devel -Patch1: 0001-Switch-from-python-to-python3.patch -Patch2: 0002-Fix-build-error-with-Python-3-caused-by-itervalues-i.patch -Patch3: 0003-Only-split-proc-status-lines-on-the-character.patch -Patch4: 0004-Ignore-invalid-lines-in-proc-status-files.patch -Patch5: 0005-Actually-skip-invalid-lines-in-proc-status.patch Patch6: 0006-replace-powerpc-with-ppc-in-ioprio.py.patch Patch7: 0007-add-aarch64-prio-in-ioprio.py.patch -Patch8: 0008-Print-the-titles-at-specific-locations.patch -Patch9: 0009-Improve-the-message-that-is-printed-when-Linux-tasks.patch -Patch10: 0010-Fix-crash-due-to-syntax-error.patch -Patch11: 0011-Use-monotonic-time-to-calculate-durations.patch -Patch12: 0012-riscv-Add-riscv64-support.patch %description iotop watches I/O usage information output by the Linux kernel (requires 2.6.20 or later) and @@ -41,24 +30,27 @@ Requires: man This contains man files for the using of iotop %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-0.6 -p1 %build %py3_build %install -%{__python3} setup.py install -O1 --skip-build --root=%{buildroot} --install-scripts=%{_sbindir} +%py3_install %files -%doc README +%doc README NEWS THANKS %license COPYING -%{python3_sitelib}/* -%{_sbindir}/iotop +%{python3_sitearch}/iotop* +%{_bindir}/iotop %files help %{_mandir}/man8/iotop.* %changelog +* Sun Feb 04 2024 Paul Thomas - 0.6^20240204git4b2e1aa2-1 +- update to latest snapshot + * Sun Sep 17 2023 Mingzheng Xing - 0.6-25 - riscv: Add riscv64 support