SOURCES/iotop-0.6-delayacctcheck.patch

@@ -1,29 +0,0 @@
-diff -up iotop-0.6/iotop/data.py.delayacctcheck iotop-0.6/iotop/data.py
---- iotop-0.6/iotop/data.py.delayacctcheck	2023-12-11 22:15:47.280664665 +0100
-+++ iotop-0.6/iotop/data.py	2023-12-11 22:14:16.689868890 +0100
-@@ -27,6 +27,7 @@ import stat
- import struct
- import sys
- import time
-+from procfs import cmdline
- 
- #
- # Check for requirements:
-@@ -455,8 +456,17 @@ class ProcessList(DumpableObject):
- 
- 
- def sysctl_task_delayacct():
-+    """ WAS:
-     try:
-         with open('/proc/sys/kernel/task_delayacct') as f:
-             return bool(int(f.read().strip()))
-     except FileNotFoundError:
-         return None
-+
-+
-+    Because /proc/sys/kernel/task_delayacct doesn't exist on RHEL8,
-+    it always returns None, which is equivalent to False in the end.
-+
-+    On RHEL8, delayacct_on kernel variable is enabled by default
-+    """
-+    return 'nodelayacct' not in cmdline().keys()

SPECS/iotop.spec

@@ -1,6 +1,6 @@
 Name: iotop
 Version: 0.6
-Release: 18%{?dist}
+Release: 30%{?dist}
 Summary: Top like utility for I/O       
 License: GPLv2+
 URL: http://guichaz.free.fr/iotop/            
@@ -25,10 +25,6 @@ Patch6:	iotop-0.6-git9c49d59.patch
 # rhbz#1679201
 Patch7:	iotop-0.6-delayacctmsg.patch
 
-# downstream for RHEL8, #RHEL-16345
-Patch8:	iotop-0.6-delayacctcheck.patch
-
-Requires: python3-linux-procfs
 BuildArch: noarch
 BuildRequires:	python3-devel
 
@@ -40,15 +36,14 @@ show of behalf of which process is the I/O going on.
 
 %prep
 %setup -n %{name}-%{version}
-%patch -P 0 -p1 -b .noendcurses
+%patch0 -p1 -b .noendcurses
-%patch -P 1 -p1 -b .python3
+%patch1 -p1 -b .python3
-%patch -P 2	-p1
+%patch2	-p1
-%patch -P 3 -p1 -b .batchprintutf8
+%patch3 -p1 -b .batchprintutf8
-%patch -P 4 -p1 -b .gitdd4fcc71
+%patch4 -p1 -b .gitdd4fcc71
-%patch -P 5 -p1 -b .gitab35334d
+%patch5 -p1 -b .gitab35334d
-%patch -P 6 -p1 -b .git9c49d59
+%patch6 -p1 -b .git9c49d59
-%patch -P 7 -p1 -b .delayacctmsg
+%patch7 -p1 -b .delayacctmsg
-%patch -P 8 -p1 -b .delayacctcheck
 
 %build
 %py3_build
@@ -64,14 +59,48 @@ show of behalf of which process is the I/O going on.
 %{_mandir}/man8/iotop.*
 
 %changelog
-* Fri Mar 29 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.6-18
+* Fri Jul 01 2022 Michal Hlavinka <mhlavink@redhat.com> - 0.6-30
-- Rebuilt for MSVSphere 8.10 beta
+- bump release for gating rebuild(#2052422)
+
+* Tue Jun 28 2022 Michal Hlavinka <mhlavink@redhat.com> - 0.6-29
+- do not show DELAY_ACCT error for non-existent pids(#2052422)
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.6-28
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.6-27
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.6-24
+- Rebuilt for Python 3.9
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6-22
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6-21
+- Rebuilt for Python 3.8
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Mon Dec 11 2023 Michal Hlavinka <mhlavink@redhat.com> - 0.6-18
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-18
-- fix check for delayacct (#RHEL-16345)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Feb 14 2022 Michal Hlavinka <mhlavink@redhat.com> - 0.6-17
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.6-17
-- do not show DELAY_ACCT error for non-existent pids(#1679201)
+- Rebuilt for Python 3.7
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild