diff --git a/.gitignore b/.gitignore index 35fca31..9bcea87 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ atop-1.23.tar.gz /atop-2.3.0.tar.gz /atop-2.4.0.tar.gz /atop-2.5.0.tar.gz +/atop-2.6.0.tar.gz diff --git a/atop-2.3.0-restart.patch b/atop-2.3.0-restart.patch deleted file mode 100644 index 889c462..0000000 --- a/atop-2.3.0-restart.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- atop.cronsystemd~ 2017-03-25 04:00:03.000000000 -0500 -+++ atop.cronsystemd 2017-12-11 12:05:26.269480824 -0600 -@@ -1,2 +1,2 @@ - # daily restart of atop at midnight --0 0 * * * root systemctl restart atop -+0 0 * * * root systemctl try-restart atop diff --git a/atop-2.5.0-python3.patch b/atop-2.5.0-python3.patch deleted file mode 100644 index 029f030..0000000 --- a/atop-2.5.0-python3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- atopgpud.orig 2019-01-12 16:37:19.000000000 -0600 -+++ atopgpud 2019-09-05 10:40:24.909804909 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -Es -+#!/usr/bin/python3 -Es - - # ============================================================== - # Daemon that gathers statistical information from all -@@ -503,7 +503,7 @@ - # active processes for - # this GPU - # --------------------- -- for pid, stat in s.procstats.items(): -+ for pid, stat in list(s.procstats.items()): - strbuf += "#A {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, - stat.gpubusy, stat.membusy, stat.timems, - stat.memnow, stat.memcum, stat.sample) -@@ -512,7 +512,7 @@ - # terminated processes - # for this GPU - # --------------------- -- for pid, stat in cliterm[clisock].items(): -+ for pid, stat in list(cliterm[clisock].items()): - strbuf += "#E {:d} {:d} {:d} {:d} {:d} {:d} {:d}".format(pid, - stat.gpubusy, stat.membusy, stat.timems, - stat.memnow, stat.memcum, stat.sample) diff --git a/atop.spec b/atop.spec index 67e16bc..94eb074 100644 --- a/atop.spec +++ b/atop.spec @@ -1,20 +1,19 @@ %define _hardened_build 1 Name: atop -Version: 2.5.0 -Release: 4%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz +URL: http://www.atoptool.nl +Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source4: atop.sysconfig Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch -Patch3: atop-2.5.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -51,7 +50,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc -%patch3 -p0 -b .py3 # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -117,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Mon Dec 21 2020 Gwyn Ciesla - 2.6.0-1 +- 2.6.0 + * Mon Jul 27 2020 Fedora Release Engineering - 2.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 9a88925..625a61d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.5.0.tar.gz) = 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 +SHA512 (atop-2.6.0.tar.gz) = 8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88