8 changed files with 153 additions and 365 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,22 @@
-psutil-*.tar.gz
+psutil-0.1.3.tar.gz
+/psutil-0.2.0.tar.gz
+/psutil-0.2.1.tar.gz
+/psutil-0.3.0.tar.gz
+/psutil-0.4.0.tar.gz
+/psutil-0.4.1.tar.gz
+/psutil-0.5.1.tar.gz
+/psutil-0.6.1.tar.gz
+/psutil-0.7.1.tar.gz
+/psutil-1.0.1.tar.gz
+/psutil-1.2.1.tar.gz
+/psutil-2.1.3.tar.gz
+/psutil-2.2.0.tar.gz
+/psutil-3.1.1.tar.gz
+/psutil-3.2.1.tar.gz
+/psutil-4.3.0.tar.gz
+/psutil-4.3.1.tar.gz
+/psutil-4.4.0.tar.gz
+/psutil-5.0.1.tar.gz
+/psutil-5.2.1.tar.gz
+/psutil-5.2.2.tar.gz
+/psutil-5.4.3.tar.gz
--- a/psutil-5.0.1-disable-broken-tests.patch
+++ b/psutil-5.0.1-disable-broken-tests.patch
@ -0,0 +1,20 @@
+diff -Nur psutil-release-5.0.1.orig/psutil/tests/test_memory_leaks.py psutil-release-5.0.1/psutil/tests/test_memory_leaks.py
+--- psutil-release-5.0.1.orig/psutil/tests/test_memory_leaks.py	2016-12-20 18:34:12.000000000 -0700
+++ psutil-release-5.0.1/psutil/tests/test_memory_leaks.py	2017-01-02 10:40:49.883876413 -0700
+@@ -296,11 +296,11 @@
+ 
+     @unittest.skipUnless(WINDOWS or LINUX or FREEBSD,
+                          "platform not supported")
+-    def test_cpu_affinity_set(self):
+-        affinity = thisproc.cpu_affinity()
+-        self.execute(self.proc.cpu_affinity, affinity)
+-        if not TRAVIS:
+-            self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1])
+#    def test_cpu_affinity_set(self):
+#        affinity = thisproc.cpu_affinity()
+#        self.execute(self.proc.cpu_affinity, affinity)
+#        if not TRAVIS:
+#            self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1])
+ 
+     @skip_if_linux()
+     def test_open_files(self):
--- a/psutil-5.4.3-disable-broken-tests.patch
+++ b/psutil-5.4.3-disable-broken-tests.patch
@ -0,0 +1,66 @@
+--- psutil/tests/test_memory_leaks.py~	2018-01-01 14:32:56.000000000 -0600
+++ psutil/tests/test_memory_leaks.py	2018-01-22 10:03:05.206021533 -0600
+@@ -365,14 +365,14 @@
+     @skip_if_linux()
+     # Windows implementation is based on a single system-wide
+     # function (tested later).
+-    @unittest.skipIf(WINDOWS, "worthless on WINDOWS")
+-    def test_connections(self):
+-        # TODO: UNIX sockets are temporarily implemented by parsing
+-        # 'pfiles' cmd  output; we don't want that part of the code to
+-        # be executed.
+-        with create_sockets():
+-            kind = 'inet' if SUNOS else 'all'
+-            self.execute(self.proc.connections, kind)
+#    @unittest.skipIf(WINDOWS, "worthless on WINDOWS")
+#    def test_connections(self):
+#        # TODO: UNIX sockets are temporarily implemented by parsing
+#        # 'pfiles' cmd  output; we don't want that part of the code to
+#        # be executed.
+#        with create_sockets():
+#            kind = 'inet' if SUNOS else 'all'
+#            self.execute(self.proc.connections, kind)
+ 
+     @unittest.skipIf(not HAS_ENVIRON, "not supported")
+     def test_environ(self):
+--- psutil/tests/test_memory_leaks.py~	2018-01-22 10:04:04.000000000 -0600
+++ psutil/tests/test_memory_leaks.py	2018-01-22 10:08:05.378651502 -0600
+@@ -200,7 +200,7 @@
+             "pid", "as_dict", "children", "cpu_affinity", "cpu_percent",
+             "ionice", "is_running", "kill", "memory_info_ex", "memory_percent",
+             "nice", "oneshot", "parent", "rlimit", "send_signal", "suspend",
+-            "terminate", "wait"))
+            "terminate", "wait", "connections"))
+         for name in dir(psutil.Process):
+             if name.startswith('_'):
+                 continue
+--- psutil/tests/test_memory_leaks.py~	2018-01-22 10:32:07.000000000 -0600
+++ psutil/tests/test_memory_leaks.py	2018-01-22 10:32:23.085998319 -0600
+@@ -200,7 +200,7 @@
+             "pid", "as_dict", "children", "cpu_affinity", "cpu_percent",
+             "ionice", "is_running", "kill", "memory_info_ex", "memory_percent",
+             "nice", "oneshot", "parent", "rlimit", "send_signal", "suspend",
+-            "terminate", "wait", "connections"))
+            "terminate", "wait", "connections", "memory_maps"))
+         for name in dir(psutil.Process):
+             if name.startswith('_'):
+                 continue
+--- psutil/tests/test_memory_leaks.py~	2018-01-22 10:32:51.000000000 -0600
+++ psutil/tests/test_memory_leaks.py	2018-01-22 10:34:06.757525147 -0600
+@@ -344,11 +344,11 @@
+             self.execute(self.proc.open_files)
+ 
+     # OSX implementation is unbelievably slow
+-    @unittest.skipIf(OSX, "too slow on OSX")
+-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
+-    @skip_if_linux()
+-    def test_memory_maps(self):
+-        self.execute(self.proc.memory_maps)
+#    @unittest.skipIf(OSX, "too slow on OSX")
+#    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
+#    @skip_if_linux()
+#    def test_memory_maps(self):
+#        self.execute(self.proc.memory_maps)
+ 
+     @unittest.skipIf(not LINUX, "LINUX only")
+     @unittest.skipIf(not HAS_RLIMIT, "not supported")
--- a/python-psutil-include-unistd.h.patch
+++ b/python-psutil-include-unistd.h.patch
@ -1,12 +0,0 @@
-diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c
-index a6ee602..56fd4f6 100644
--- a/psutil/_psutil_linux.c
-+++ b/psutil/_psutil_linux.c
-@@ -24,6 +24,7 @@
- #include <linux/sockios.h>
- #include <linux/if.h>
- #include <sys/resource.h>
-+#include <unistd.h>
- 
- // see: https://github.com/giampaolo/psutil/issues/659
- #ifdef PSUTIL_ETHTOOL_MISSING_TYPES
--- a/python-psutil-skip-tests-in-mock.patch
+++ b/python-psutil-skip-tests-in-mock.patch
@ -1,169 +0,0 @@
-diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_contracts.py psutil-release-5.9.5/psutil/tests/test_contracts.py
--- psutil-release-5.9.5.orig/psutil/tests/test_contracts.py	2023-08-04 06:14:41.080097504 -0500
-+++ psutil-release-5.9.5/psutil/tests/test_contracts.py	2023-08-04 06:36:02.844609234 -0500
-@@ -425,6 +425,7 @@
-                 ls.append(proc_info(pid))
-             return ls
- 
-+    @unittest.skip("Unreliable in mock")
-     def test_all(self):
-         failures = []
-         for info in self.iter_proc_info():
-diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_linux.py psutil-release-5.9.5/psutil/tests/test_linux.py
--- psutil-release-5.9.5.orig/psutil/tests/test_linux.py	2023-08-04 06:14:41.080097504 -0500
-+++ psutil-release-5.9.5/psutil/tests/test_linux.py	2023-08-04 08:32:44.666822057 -0500
-@@ -257,7 +257,7 @@
-         psutil_value = psutil.virtual_memory().total
-         self.assertEqual(cli_value, psutil_value)
- 
-    @retry_on_failure()
-+    @unittest.skip("Unreliable on mock")
-     def test_used(self):
-         # Older versions of procps used slab memory to calculate used memory.
-         # This got changed in:
-@@ -314,6 +314,7 @@
-             vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM)
- 
-     @retry_on_failure()
-+    @unittest.skip("Unreliable in mock")
-     def test_used(self):
-         # Older versions of procps used slab memory to calculate used memory.
-         # This got changed in:
-@@ -691,8 +692,7 @@
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemCPUCountLogical(PsutilTestCase):
- 
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu/online"),
-                     "/sys/devices/system/cpu/online does not exist")
-+    @unittest.skip("Unreliable on mock")
-     def test_against_sysdev_cpu_online(self):
-         with open("/sys/devices/system/cpu/online") as f:
-             value = f.read().strip()
-@@ -700,14 +700,13 @@
-             value = int(value.split('-')[1]) + 1
-             self.assertEqual(psutil.cpu_count(), value)
- 
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"),
-                     "/sys/devices/system/cpu does not exist")
-+    @unittest.skip("Unreliable in mock on ppc64le")
-     def test_against_sysdev_cpu_num(self):
-         ls = os.listdir("/sys/devices/system/cpu")
-         count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None])
-         self.assertEqual(psutil.cpu_count(), count)
- 
-    @unittest.skipIf(not which("nproc"), "nproc utility not available")
-+    @unittest.skip("Unreliable on mock")
-     def test_against_nproc(self):
-         num = int(sh("nproc --all"))
-         self.assertEqual(psutil.cpu_count(logical=True), num)
-@@ -752,7 +751,7 @@
-                 assert m.called
- 
- 
-@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable on mock")
- class TestSystemCPUCountCores(PsutilTestCase):
- 
-     @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-@@ -784,7 +783,7 @@
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemCPUFrequency(PsutilTestCase):
- 
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable on mock")
-     def test_emulate_use_second_file(self):
-         # https://github.com/giampaolo/psutil/issues/981
-         def path_exists_mock(path):
-@@ -798,7 +797,7 @@
-                         create=True):
-             assert psutil.cpu_freq()
- 
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable on mock")
-     def test_emulate_use_cpuinfo(self):
-         # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
-         # exist and /proc/cpuinfo is used instead.
-@@ -923,7 +922,7 @@
-                     self.assertEqual(freq.current, 200)
- 
- 
-@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable on mock")
- class TestSystemCPUStats(PsutilTestCase):
- 
-     def test_ctx_switches(self):
-@@ -956,7 +955,7 @@
- # =====================================================================
- 
- 
-@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable on mock")
- class TestSystemNetIfAddrs(PsutilTestCase):
- 
-     def test_ips(self):
-@@ -1350,7 +1349,7 @@
-             self.assertRaises(FileNotFoundError, finder.ask_sys_dev_block)
-         finder.ask_sys_class_block()
- 
-    @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Unreliable on mock")
-     def test_comparisons(self):
-         finder = RootFsDeviceFinder()
-         self.assertIsNotNone(finder.find())
-@@ -1373,11 +1372,13 @@
- 
-     @unittest.skipIf(not which("findmnt"), "findmnt utility not available")
-     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Unreliable on mock")
-     def test_against_findmnt(self):
-         psutil_value = RootFsDeviceFinder().find()
-         findmnt_value = sh("findmnt -o SOURCE -rn /")
-         self.assertEqual(psutil_value, findmnt_value)
- 
-+    @unittest.skip("Unreliable on mock")
-     def test_disk_partitions_mocked(self):
-         with mock.patch(
-                 'psutil._pslinux.cext.disk_partitions',
-@@ -1513,6 +1514,7 @@
-                 psutil._pslinux.boot_time)
-             assert m.called
- 
-+    @unittest.skip("Unreliable on mock")
-     def test_users_mocked(self):
-         # Make sure ':0' and ':0.0' (returned by C ext) are converted
-         # to 'localhost'.
-@@ -2275,6 +2277,7 @@
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skip("Unreliable on mock")
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_system.py psutil-release-5.9.5/psutil/tests/test_system.py
--- psutil-release-5.9.5.orig/psutil/tests/test_system.py	2023-08-04 06:14:41.080097504 -0500
-+++ psutil-release-5.9.5/psutil/tests/test_system.py	2023-08-04 08:18:37.164817563 -0500
-@@ -512,10 +512,7 @@
-             if not AIX and name in ('ctx_switches', 'interrupts'):
-                 self.assertGreater(value, 0)
- 
-    # TODO: remove this once 1892 is fixed
-    @unittest.skipIf(MACOS and platform.machine() == 'arm64',
-                     "skipped due to #1892")
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable on mock")
-     def test_cpu_freq(self):
-         def check_ls(ls):
-             for nt in ls:
-diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_testutils.py psutil-release-5.9.5/psutil/tests/test_testutils.py
--- psutil-release-5.9.5.orig/psutil/tests/test_testutils.py	2023-08-04 06:14:41.080097504 -0500
-+++ psutil-release-5.9.5/psutil/tests/test_testutils.py	2023-08-04 06:35:41.421931668 -0500
-@@ -370,7 +370,7 @@
-         self.assertRaises(ValueError, self.execute, lambda: 0, retries=-1)
- 
-     @retry_on_failure()
-    @unittest.skipIf(CI_TESTING, "skipped on CI")
-+    @unittest.skip("Unreliable in mock")
-     @unittest.skipIf(COVERAGE, "skipped during test coverage")
-     def test_leak_mem(self):
-         ls = []
--- a/python-psutil-test-sum-floats-via-almost-equal.patch
+++ b/python-psutil-test-sum-floats-via-almost-equal.patch
@ -1,22 +0,0 @@
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index 3b787ee..db22245 100755
--- a/psutil/tests/test_system.py
-+++ b/psutil/tests/test_system.py
-@@ -346,7 +346,7 @@ class TestCpuAPIs(PsutilTestCase):
-             self.assertIsInstance(cp_time, float)
-             self.assertGreaterEqual(cp_time, 0.0)
-             total += cp_time
-        self.assertEqual(total, sum(times))
-+        self.assertAlmostEqual(total, sum(times))
-         str(times)
-         # CPU times are always supposed to increase over time
-         # or at least remain the same and that's because time
-@@ -385,7 +385,7 @@ class TestCpuAPIs(PsutilTestCase):
-                 self.assertIsInstance(cp_time, float)
-                 self.assertGreaterEqual(cp_time, 0.0)
-                 total += cp_time
-            self.assertEqual(total, sum(times))
-+            self.assertAlmostEqual(total, sum(times))
-             str(times)
-         self.assertEqual(len(psutil.cpu_times(percpu=True)[0]),
-                          len(psutil.cpu_times(percpu=False)))
--- a/python-psutil.spec
+++ b/python-psutil.spec
@ -1,37 +1,31 @@
 %global srcname psutil
 %global sum A process and system utilities module for Python

+# Filter Python modules from Provides
+%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
+
 Name:           python-%{srcname}
-Version:        5.9.5
-Release:        2%{?dist}
+Version:        5.4.3
+Release:        6%{?dist}
 Summary:        %{sum}

-License:        BSD-3-Clause
+License:        BSD
 URL:            https://github.com/giampaolo/psutil
-Source0:        %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz
+Source0:        https://github.com/giampaolo/psutil/archive/release-%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
 #
-# skip 2 tests that fail in mock chroots
+# Disable upstream failing test
+# https://github.com/giampaolo/psutil/issues/946
 #
-Patch0:         python-psutil-skip-tests-in-mock.patch
-#
-# avoid: AssertionError: 7883822.420000001 != 7883822.42
-#
-Patch1:         python-psutil-test-sum-floats-via-almost-equal.patch
-#
-# include unistd.h to avoid (on Python 3.13+):
-#   error: implicit declaration of function ‘syscall’
-#   error: implicit declaration of function ‘close’
-# upstream PR: https://github.com/giampaolo/psutil/pull/2321
-#
-Patch2:         python-psutil-include-unistd.h.patch
+#Patch0:         psutil-5.4.3-disable-broken-tests.patch

 BuildRequires:  gcc
-BuildRequires:  grep
-BuildRequires:  make
+BuildRequires:  python2-devel
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
 # Test dependencies
 BuildRequires:  procps-ng
+BuildRequires:  python2-mock
+BuildRequires:  python%{python3_pkgversion}-mock
+BuildRequires:  python2-ipaddress

 %description
 psutil is a module providing an interface for retrieving information on all
@ -41,9 +35,21 @@ command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
 ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.


+%package -n python2-%{srcname}
+Summary:        %{sum}
+%{?python_provide:%python_provide python2-%{srcname}}
+Obsoletes:      python-%{srcname} < 3.1.1-3
+
+%description -n python2-psutil
+psutil is a module providing an interface for retrieving information on all
+running processes and system utilization (CPU, memory, disks, network, users) in
+a portable way by using Python 3, implementing many functionalities offered by
+command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
+ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
+
 %package -n python%{python3_pkgversion}-psutil
 Summary:        %{sum}
-
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}

 %description -n python%{python3_pkgversion}-psutil
 psutil is a module providing an interface for retrieving information on all
@ -52,15 +58,9 @@ a portable way by using Python 3, implementing many functionalities offered by
 command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
 ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.

-%package -n python%{python3_pkgversion}-psutil-tests
-Summary:        %{sum}, test suite
-Requires:       python%{python3_pkgversion}-psutil%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n python%{python3_pkgversion}-psutil-tests
-The test suite for psutil.

 %prep
-%autosetup -p1 -n %{srcname}-release-%{version}
+%autosetup -p0 -n %{srcname}-release-%{version}

 # Remove shebangs
 find psutil -name \*.py | while read file; do
@ -71,152 +71,36 @@ done


 %build
+%py2_build
 %py3_build


 %install
+%py2_install
 %py3_install

-# Ignore tests when building with flatpak-module-tools to avoid build failures
-# when building inside VMs or containers. Flatpaks would usually build this package
-# as dependency from stable and already tested branches.

-%if ! 0%{?flatpak}
-%check
-# Setting APPVEYOR to convince the test suite this is a CI.
-# That way, some unreliable tests are skipped and some timeouts are extended.
-# Previously, this was done by the CI_TESTING variable, but that works no more.
-# Alternative is to set GITHUB_ACTIONS but that has undesirable side effects.
-make test APPVEYOR=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitearch}
-%endif
+#%check
+# the main test target causes failures, investigating
+#make test-memleaks PYTHON=%{__python2}
+#make test-memleaks PYTHON=%{__python3}
+
+ 
+%files -n python2-%{srcname}
+%license LICENSE
+%doc CREDITS HISTORY.rst README.rst
+%{python2_sitearch}/%{srcname}/
+%{python2_sitearch}/*.egg-info
+

 %files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE
 %doc CREDITS HISTORY.rst README.rst
 %{python3_sitearch}/%{srcname}/
-%{python3_sitearch}/%{srcname}-%{version}-py%{python3_version}.egg-info/
-%exclude %{python3_sitearch}/%{srcname}/tests
-
-%files -n python%{python3_pkgversion}-%{srcname}-tests
-%{python3_sitearch}/%{srcname}/tests/
+%{python3_sitearch}/*.egg-info


 %changelog
-* Tue Aug 08 2023 Karolina Surma <ksurma@redhat.com> - 5.9.5-2
- Declare the license as an SPDX expression
-
-* Fri Aug 04 2023 Jonathan Wright <jonathan@almalinux.org> - 5.9.5-1
- Update to 5.9.5 rhbz#2135931
- Skip unreliable test rhbz#2169395
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.9.2-3
- Rebuilt for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Sep 18 2022 Kevin Fenzi <kevin@scrye.com> - 5.9.2-1
- Update to 5.9.2. Fixes rhbz#2124116
-
-* Sun Jul 31 2022 Jonathan Wright <jonathan@almalinux.org> - 5.9.1-1
- Update to 5.9.1.  Fixes rhbz#2036137
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.8.0-15
- Rebuilt for Python 3.11
-
-* Thu Jun 09 2022 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-14
- Relax testing assumptions when building the package
- Fixes: rhbz#2049426
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Sep 08 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-12
- Drop python2-psutil, as it is no longer needed
-
-* Wed Aug 18 2021 Charalampos Stratakis <cstratak@redhat.com> - 5.8.0-11
- Separate the tests to their own subpackage
-
-* Sat Aug 07 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-10
- Add patch to add delta for cpu tests.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jun 23 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-8
- Drop optional build dependency on python2-setuptools
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 5.8.0-7
- Rebuilt for Python 3.10
-
-* Thu Apr 15 2021 Miro Hrončok <mhroncok@redhat.com> - 5.8.0-6
- Add tolerance to a flaky test
-
-* Thu Jan 28 2021 Tomas Orsava <torsava@redhat.com> - 5.8.0-5
- Remove unnecessary test dependency on python3-mock
- Remove unnecessary macro __provides_exclude_from
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 10 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-3
- Disable test_leak_mem test.
-
-* Sun Jan 10 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-2
- Disable test_sensors_temperatures test.
-
-* Fri Jan 01 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-1
- Update to 5.8.0. Fixes rhbz#1909321
- Re-enable tests (skipping 2 that fail in mock).
-
-* Fri Nov 06 2020 Joel Capitao <jcapitao@redhat.com> - 5.7.3-1
- Update to 5.7.3 (rhbz#1857187)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Nicolas Chauvet <kwizart@gmail.com> - 5.7.2-1
- Update to 5.7.2
-
-* Wed Jun 24 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 5.6.7-3
- Add BR on setuptools for all package combinations
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 5.6.7-2
- Rebuilt for Python 3.9
-
-* Sun Feb 16 2020 Kevin Fenzi <kevin@scrye.com> - 5.6.7-1
- Update to 5.6.7. Fixes bug 1768362.
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Oct 06 2019 Kevin Fenzi <kevin@scrye.com> - 5.6.3-5
- Add python2-setuptools to BuildRequires to fix egg info. Fixes bug #1750362
-
-* Tue Sep 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.6.3-4
- Reduce unused build dependencies
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 5.6.3-3
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jun 30 2019 Kevin Fenzi <kevin@scrye.com> - 5.6.3-1
- Update to 5.6.3 Fixes bug #1567102
-
-* Thu Feb 28 2019 Yatin Karel <ykarel@redhat.com> - 5.5.1-1
- Update to 5.5.1 (Resolves #1567102)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

@ -256,7 +140,7 @@ make test APPVEYOR=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitea

 * Mon Jan 02 2017 Kevin Fenzi <kevin@scrye.com> - 5.0.1-1
 - Update to 5.0.1. Fixes bug #1389579
- Disable failing test while upstream looks at it.
+- Disable failing test while upstream looks at it. 

 * Wed Nov 09 2016 Kevin Fenzi <kevin@scrye.com> - 5.0.0-1
 - Update to 5.0.0. Fixes bug #1389579
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (psutil-5.9.5.tar.gz) = b9872acbecd1d9a9a79f032bd375ff0f10be4574e5f76f904c7a6367d7d3e24e7f0a1d06affa2fafbea74ecb594017029bdf29fdb8a8d37aeb51fb0016c3339c
+SHA512 (psutil-5.4.3.tar.gz) = e94a8f184000fa43ad8490badea6838b82e17d1a0f5e17cc61658dcac4eb841782bd393faf056de6e6ad26d04415a68bef59361ae2e0f77f822bb4ed37d84247