From b0b7099d118945aa69832b4836a89037f7d88e5c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 Aug 2019 08:24:09 -0500 Subject: [PATCH 01/42] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From f2910c68fbf72d036e618d59a53159c0aa06d9b0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Sep 2019 11:29:39 -0500 Subject: [PATCH 02/42] Don't ship atopgpud. --- atop.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/atop.spec b/atop.spec index 710dd62..51b2a10 100644 --- a/atop.spec +++ b/atop.spec @@ -15,13 +15,11 @@ Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-restart.patch Patch3: atop-2.3.0-newer-gcc.patch -Patch4: atop-2.4.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd -Requires: python3-py3nvml Requires(post): systemd Requires(preun): systemd @@ -52,7 +50,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch1 -p0 -b .sysconfig %patch2 -p0 -b .cron %patch3 -p1 -b .newer-gcc -%patch4 -p0 -b .py3 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -71,23 +68,18 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service -install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud -install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %post %systemd_post atop.service %systemd_post atopacct.service -%systemd_post atopgpu.service %preun %systemd_preun atop.service %systemd_preun atopacct.service -%systemd_preun atopgpu.service %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service -%systemd_postun_with_restart atopgpu.service %files @@ -109,11 +101,10 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %{_unitdir}/atop*.service %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd -%{_sbindir}/atopgpud %changelog * Thu Sep 05 2019 Gwyn Ciesla - 2.4.0-4 -- Package atopacctd and atopgpud. +- Package atopacctd. * Wed Aug 28 2019 Gwyn Ciesla - 2.4.0-3 - Fix LOGINTERVAL in sysconfig. From 8d20c8cbb1ffcc9531c71f1f03f2b3014a5830a2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sun, 3 Nov 2019 13:54:48 -0600 Subject: [PATCH 03/42] 2.5.0 --- .gitignore | 1 + ...-python3.patch => atop-2.5.0-python3.patch | 9 ------- atop.spec | 26 +++++++++++-------- sources | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) rename atop-2.4.0-python3.patch => atop-2.5.0-python3.patch (76%) diff --git a/.gitignore b/.gitignore index a3bb67c..35fca31 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ atop-1.23.tar.gz /atop-2.2-3.tar.gz /atop-2.3.0.tar.gz /atop-2.4.0.tar.gz +/atop-2.5.0.tar.gz diff --git a/atop-2.4.0-python3.patch b/atop-2.5.0-python3.patch similarity index 76% rename from atop-2.4.0-python3.patch rename to atop-2.5.0-python3.patch index 5dcfc31..029f030 100644 --- a/atop-2.4.0-python3.patch +++ b/atop-2.5.0-python3.patch @@ -6,15 +6,6 @@ # ============================================================== # Daemon that gathers statistical information from all -@@ -181,7 +181,7 @@ - self.stats.procstats[pid].memcum += proc.usedGpuMemory//1024 - self.stats.procstats[pid].sample += 1 - -- if self.stats.tasksupport & ACCOUNT: -+ if self.stats.tasksupport & ACCOUNT: - try: - stats = pynvml.nvmlDeviceGetAccountingStats(self.gpuhandle, pid) - @@ -503,7 +503,7 @@ # active processes for # this GPU diff --git a/atop.spec b/atop.spec index 710dd62..4370345 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.4.0 -Release: 4%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -13,9 +13,8 @@ Source5: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch -Patch2: atop-2.3.0-restart.patch -Patch3: atop-2.3.0-newer-gcc.patch -Patch4: atop-2.4.0-python3.patch +Patch2: atop-2.3.0-newer-gcc.patch +Patch3: atop-2.5.0-python3.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -50,9 +49,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %setup -q %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig -%patch2 -p0 -b .cron -%patch3 -p1 -b .newer-gcc -%patch4 -p0 -b .py3 +%patch2 -p1 -b .newer-gcc +%patch3 -p0 -b .py3 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -63,7 +61,6 @@ install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 -install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd @@ -73,21 +70,25 @@ install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service +install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service %systemd_post atopacct.service %systemd_post atopgpu.service +%systemd_post atop-rotate.timer %preun %systemd_preun atop.service %systemd_preun atopacct.service %systemd_preun atopgpu.service +%systemd_preun atop-rotate.timer %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service %systemd_postun_with_restart atopgpu.service +%systemd_postun_with_restart atop-rotate.timer %files @@ -96,8 +97,7 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %else %license COPYING %endif -%doc AUTHOR README ChangeLog -%config(noreplace) %{_sysconfdir}/cron.d/atop +%doc AUTHOR README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -107,11 +107,15 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service %{_mandir}/man1/atopsar.1.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop*.service +%{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd %{_sbindir}/atopgpud %changelog +* Sun Nov 03 2019 Gwyn Ciesla - 2.5.0-1 +- 2.5.0 + * Thu Sep 05 2019 Gwyn Ciesla - 2.4.0-4 - Package atopacctd and atopgpud. diff --git a/sources b/sources index fb15a00..9a88925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.4.0.tar.gz) = 2d0bbecc13bd64427263372b50f50d3278d1e0401e7f2eefe6ff20a874da6315271c885cef3492cde60a2955d1c8db4d8522c3374edcedf1a6992b8fa97c8f18 +SHA512 (atop-2.5.0.tar.gz) = 8c50482194b60afedfd9d593ea7e916b63310bd3b43965fbd2769a2673f6f2247dec764ed1576866321a4b9c7301d5d8369c97fb6d351246395d01772ad04489 From 19d303cdb4e4078893f750453fd9d548387c8432 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:23:42 +0000 Subject: [PATCH 04/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 4370345..22228a3 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -113,6 +113,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Nov 03 2019 Gwyn Ciesla - 2.5.0-1 - 2.5.0 From 09968b749cf99ce5b6b60acbc755e1e0fe26b236 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 29 May 2020 08:57:37 -0500 Subject: [PATCH 05/42] Fix unit file path. --- atop.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 22228a3..33d4724 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -52,6 +52,9 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %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 + %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" @@ -113,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Fri May 29 2020 Gwyn Ciesla - 2.5.1-1 +- Fix unit file path. + * Tue Jan 28 2020 Fedora Release Engineering - 2.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4783606498d47456d0176034e9b7fcab9f44c57e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:40:02 +0000 Subject: [PATCH 06/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 33d4724..6c6b365 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 29 2020 Gwyn Ciesla - 2.5.1-1 - Fix unit file path. From 77a41b3f4c2bdb440d312f7a3dcfce9e896284a1 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:12:31 +0000 Subject: [PATCH 07/42] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 18dce2f8d073dc9f0d7b75b816c5268aed6d245b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 00:00:06 +0000 Subject: [PATCH 08/42] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- atop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/atop.spec b/atop.spec index 6c6b365..67e16bc 100644 --- a/atop.spec +++ b/atop.spec @@ -20,6 +20,7 @@ BuildRequires: gcc BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd +BuildRequires: make Requires: python3-py3nvml Requires(post): systemd From 6fc3f412bb60224ef6b8a84be5aa9838a35e475b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 21 Dec 2020 15:13:17 -0600 Subject: [PATCH 09/42] 2.6.0 --- .gitignore | 1 + atop-2.3.0-restart.patch | 6 ------ atop-2.5.0-python3.patch | 26 -------------------------- atop.spec | 13 +++++++------ sources | 2 +- 5 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 atop-2.3.0-restart.patch delete mode 100644 atop-2.5.0-python3.patch 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 From 9922d8e17f296db833481ae3e9914960176807c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:42:44 +0000 Subject: [PATCH 10/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 94eb074..f6dd12c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_sbindir}/atopgpud %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Gwyn Ciesla - 2.6.0-1 - 2.6.0 From f90556351351f24f4e067837b03e3e01bf7ebb0f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 22 Feb 2021 08:31:26 -0600 Subject: [PATCH 11/42] Don't ship atopgpud on EL-7 --- atop.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 8123f07..168c8c1 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -20,7 +20,9 @@ BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd BuildRequires: make +%if 0%{?rhel} >= 8 || 0%{?fedora} Requires: python3-py3nvml +%endif Requires(post): systemd Requires(preun): systemd @@ -70,26 +72,34 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service +%endif install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service %systemd_post atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_post atopgpu.service +%endif %systemd_post atop-rotate.timer %preun %systemd_preun atop.service %systemd_preun atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_preun atopgpu.service +%endif %systemd_preun atop-rotate.timer %postun %systemd_postun_with_restart atop.service %systemd_postun_with_restart atopacct.service +%if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_postun_with_restart atopgpu.service +%endif %systemd_postun_with_restart atop-rotate.timer @@ -112,9 +122,14 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd +%if 0%{?rhel} >= 8 || 0%{?fedora} %{_sbindir}/atopgpud +%endif %changelog +* Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 +- Dpn't ship atopgpud on EL-7 + * Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ad50bae7848ac730feaa02017c62a3280cd6d8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 15:59:21 +0100 Subject: [PATCH 12/42] Coalesce systemd scriptlets It is more efficient to do callout just once. --- atop.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/atop.spec b/atop.spec index 168c8c1..2debac0 100644 --- a/atop.spec +++ b/atop.spec @@ -79,28 +79,22 @@ install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post -%systemd_post atop.service -%systemd_post atopacct.service +%systemd_post atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_post atopgpu.service %endif -%systemd_post atop-rotate.timer %preun -%systemd_preun atop.service -%systemd_preun atopacct.service +%systemd_preun atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_preun atopgpu.service %endif -%systemd_preun atop-rotate.timer %postun -%systemd_postun_with_restart atop.service -%systemd_postun_with_restart atopacct.service +%systemd_postun_with_restart atop.service atopacct.service atop-rotate.timer %if 0%{?rhel} >= 8 || 0%{?fedora} %systemd_postun_with_restart atopgpu.service %endif -%systemd_postun_with_restart atop-rotate.timer %files From 10ed7aba116c4ff4fd3e85a5373ea6ba9aae309c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:09 +0100 Subject: [PATCH 13/42] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- atop.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 2debac0..2091b50 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -121,6 +121,10 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6.0-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 - Dpn't ship atopgpud on EL-7 From a8b77fbce6c56907df5326fae9842d66b01b7719 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 23 Mar 2021 14:51:13 -0500 Subject: [PATCH 14/42] Use upstream sysconfig file. --- atop.spec | 10 ++++++---- atop.sysconfig | 13 ------------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 atop.sysconfig diff --git a/atop.spec b/atop.spec index 2091b50..3312f99 100644 --- a/atop.spec +++ b/atop.spec @@ -2,13 +2,12 @@ Name: atop Version: 2.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ 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 @@ -66,7 +65,7 @@ ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily -install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop +install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop @@ -121,12 +120,15 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Mar 23 2021 Gwyn Ciesla - 2.6.0-5 +- Use upstream sysconfig file. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6.0-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. * Mon Feb 22 2021 Gwyn Ciesla - 2.6.0-3 -- Dpn't ship atopgpud on EL-7 +- Don't ship atopgpud on EL-7 * Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/atop.sysconfig b/atop.sysconfig deleted file mode 100644 index c32995b..0000000 --- a/atop.sysconfig +++ /dev/null @@ -1,13 +0,0 @@ -# sysconfig atop -# - -# Current Day format -CURDAY=`date +%Y%m%d` -# Log files path -LOGPATH=/var/log/atop -# Binaries path -BINPATH=/usr/bin -# PID File -PIDFILE=/var/run/atop.pid -# interval (default 10 minutes) -LOGINTERVAL=600 From 665062b838f5f32f3aebdfd7a474da8df03e867b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 13 Apr 2021 08:32:17 -0500 Subject: [PATCH 15/42] Upstream service file patch. --- ...19713b5e6be43671fe1856fb4bd49ff91fa7.patch | 35 +++++++++++++++++++ atop.spec | 11 ++++-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch diff --git a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch new file mode 100644 index 0000000..78fa578 --- /dev/null +++ b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch @@ -0,0 +1,35 @@ +From 9cb119713b5e6be43671fe1856fb4bd49ff91fa7 Mon Sep 17 00:00:00 2001 +From: Gerlof Langeveld +Date: Tue, 23 Mar 2021 16:50:48 +0100 +Subject: [PATCH] Correct definition of environment variable LOGOPTS The former + definition of the empty environment variable LOGOPTS in the atop.service file + (Environment=LOGOPTS="") causes an empty command line parameter for atop + running in the background. This empty parameter results in an interval timer + definition of 0 seconds which means that atop only writes one single sample + to the daily logfile and after that no more! When the environment variable is + overruled by the definition LOGOPTS="" (or another value) in the file + /etc/default/atop the problem is bypassed. + +--- + atop.service | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/atop.service b/atop.service +index 855e51b..16f24e9 100644 +--- a/atop.service ++++ b/atop.service +@@ -3,10 +3,10 @@ Description=Atop advanced performance monitor + Documentation=man:atop(1) + + [Service] +-Environment=LOGOPTS="" +-Environment=LOGINTERVAL=600 +-Environment=LOGGENERATIONS=28 +-Environment=LOGPATH=/var/log/atop ++Environment="LOGOPTS=" ++Environment="LOGINTERVAL=600" ++Environment="LOGGENERATIONS=28" ++Environment="LOGPATH=/var/log/atop" + EnvironmentFile=/etc/default/atop + ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' diff --git a/atop.spec b/atop.spec index 3312f99..567810f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,17 +2,18 @@ Name: atop Version: 2.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ URL: http://www.atoptool.nl Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz -Source5: atop.d +Source1: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch +Patch3: 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -51,6 +52,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc +%patch3 -p1 -b .service # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -66,7 +68,7 @@ install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop -install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd +install -Dp -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/atopd install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd @@ -120,6 +122,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Tue Apr 13 2021 Gwyn Ciesla - 2.6.0-6 +- Upstream patch to fix service file. + * Tue Mar 23 2021 Gwyn Ciesla - 2.6.0-5 - Use upstream sysconfig file. From c23ba78b7890c568a2a81eaa1edb3245538b0023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:14:10 +0000 Subject: [PATCH 16/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e1207aba47ab4d319acf854696276a116b6c63f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:10:12 +0000 Subject: [PATCH 17/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 567810f..5f4642f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -122,6 +122,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.6.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Apr 13 2021 Gwyn Ciesla - 2.6.0-6 - Upstream patch to fix service file. From 6b6243b52db2ca26529c1c6d97f92a27ebed5622 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 15 Dec 2021 11:29:15 -0600 Subject: [PATCH 18/42] https url, source0 --- atop.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index 5f4642f..75636cd 100644 --- a/atop.spec +++ b/atop.spec @@ -6,8 +6,8 @@ Release: 7%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http://www.atoptool.nl -Source0: http://www.atoptool.nl/download/%{name}-%{version}.tar.gz +URL: http//www.atoptool.nl +Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: nvme_support.patch From ddf1ef86afbd87297fc1aa6d8599c9d44490e5e6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Dec 2021 09:33:56 -0600 Subject: [PATCH 19/42] 2.7.0 --- .gitignore | 1 + ...19713b5e6be43671fe1856fb4bd49ff91fa7.patch | 35 ------------------- atop.spec | 9 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch diff --git a/.gitignore b/.gitignore index 9bcea87..1b8953e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ atop-1.23.tar.gz /atop-2.4.0.tar.gz /atop-2.5.0.tar.gz /atop-2.6.0.tar.gz +/atop-2.7.0.tar.gz diff --git a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch b/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch deleted file mode 100644 index 78fa578..0000000 --- a/9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9cb119713b5e6be43671fe1856fb4bd49ff91fa7 Mon Sep 17 00:00:00 2001 -From: Gerlof Langeveld -Date: Tue, 23 Mar 2021 16:50:48 +0100 -Subject: [PATCH] Correct definition of environment variable LOGOPTS The former - definition of the empty environment variable LOGOPTS in the atop.service file - (Environment=LOGOPTS="") causes an empty command line parameter for atop - running in the background. This empty parameter results in an interval timer - definition of 0 seconds which means that atop only writes one single sample - to the daily logfile and after that no more! When the environment variable is - overruled by the definition LOGOPTS="" (or another value) in the file - /etc/default/atop the problem is bypassed. - ---- - atop.service | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/atop.service b/atop.service -index 855e51b..16f24e9 100644 ---- a/atop.service -+++ b/atop.service -@@ -3,10 +3,10 @@ Description=Atop advanced performance monitor - Documentation=man:atop(1) - - [Service] --Environment=LOGOPTS="" --Environment=LOGINTERVAL=600 --Environment=LOGGENERATIONS=28 --Environment=LOGPATH=/var/log/atop -+Environment="LOGOPTS=" -+Environment="LOGINTERVAL=600" -+Environment="LOGGENERATIONS=28" -+Environment="LOGPATH=/var/log/atop" - EnvironmentFile=/etc/default/atop - ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' - ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' diff --git a/atop.spec b/atop.spec index 75636cd..c289e60 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.6.0 -Release: 7%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -13,7 +13,6 @@ Source1: atop.d Patch0: nvme_support.patch Patch1: atop-sysconfig.patch Patch2: atop-2.3.0-newer-gcc.patch -Patch3: 9cb119713b5e6be43671fe1856fb4bd49ff91fa7.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -52,7 +51,6 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %patch0 -p0 -b .nvme %patch1 -p0 -b .sysconfig %patch2 -p1 -b .newer-gcc -%patch3 -p1 -b .service # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -122,6 +120,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %endif %changelog +* Mon Dec 20 2021 Gwyn Ciesla - 2.7.0-1 +- 2.7.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.6.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 625a61d..85875e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.6.0.tar.gz) = 8d4e2ae56a63738fc615f294d1f4e27cd9eab20acaf5d36c82d87390f96d38cf28cab0a00507459c3ce6e535294a442c4546e0cf732bad253cb518a14cdf5e88 +SHA512 (atop-2.7.0.tar.gz) = f3de85bd041857bfdeb586edcb7b6f700e37cf3bc86bbcbde374eb4aaaa1f1d367b829ee23f299a545c57db5b3de504816c705d4f51bf3be547f79a2d0e99010 From faffa6f18a9846d6579c04a8d827c9b305a4cdce Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 11 Jan 2022 10:34:31 -0600 Subject: [PATCH 20/42] 2.7.1 Drop atopgpud per: https://docs.fedoraproject.org/en-US/packaging-guidelines/what-can-be-packaged/#_packages_which_are_not_useful_without_external_code --- .gitignore | 1 + atop.spec | 50 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 1b8953e..d606f84 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ atop-1.23.tar.gz /atop-2.5.0.tar.gz /atop-2.6.0.tar.gz /atop-2.7.0.tar.gz +/atop-2.7.1.tar.gz diff --git a/atop.spec b/atop.spec index c289e60..1dc453e 100644 --- a/atop.spec +++ b/atop.spec @@ -1,12 +1,12 @@ %define _hardened_build 1 Name: atop -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ -URL: http//www.atoptool.nl +URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d @@ -19,9 +19,9 @@ BuildRequires: zlib-devel BuildRequires: ncurses-devel BuildRequires: systemd BuildRequires: make -%if 0%{?rhel} >= 8 || 0%{?fedora} -Requires: python3-py3nvml -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#Requires: python3-py3nvml +#%%endif Requires(post): systemd Requires(preun): systemd @@ -41,10 +41,6 @@ performance-monitors: - Watch deviations only - Accumulated process activity per user - Accumulated process activity per program -For more informations: http://www.atcomputing.nl/Tools/atop -The package does not make use of the patches available at -http://www.atcomputing.nl/Tools/atop/kernpatch.html - %prep %setup -q @@ -71,29 +67,29 @@ install -Dp -m 0644 atop.service $RPM_BUILD_ROOT%{_unitdir}/atop.service install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop install -Dp -m 0755 atopacctd $RPM_BUILD_ROOT%{_sbindir}/atopacctd install -Dp -m 0644 atopacct.service $RPM_BUILD_ROOT%{_unitdir}/atopacct.service -%if 0%{?rhel} >= 8 || 0%{?fedora} -install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%{_sbindir}/atopgpud -install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%{_unitdir}/atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#install -Dp -m 0755 atopgpud $RPM_BUILD_ROOT%%{_sbindir}/atopgpud +#install -Dp -m 0644 atopgpu.service $RPM_BUILD_ROOT%%{_unitdir}/atopgpu.service +#%%endif install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %post %systemd_post atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_post atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_post atopgpu.service +#%%endif %preun %systemd_preun atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_preun atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_preun atopgpu.service +#%%endif %postun %systemd_postun_with_restart atop.service atopacct.service atop-rotate.timer -%if 0%{?rhel} >= 8 || 0%{?fedora} -%systemd_postun_with_restart atopgpu.service -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_postun_with_restart atopgpu.service +#%%endif %files @@ -115,11 +111,15 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily %{_sbindir}/atopacctd -%if 0%{?rhel} >= 8 || 0%{?fedora} -%{_sbindir}/atopgpud -%endif +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%{_sbindir}/atopgpud +#%%endif %changelog +* Tue Jan 11 2022 Gwyn Ciesla - 2.7.1-1 +- 2.7.1 +- Drop atopgpud as it requires proprietary NVIDIA drivers. + * Mon Dec 20 2021 Gwyn Ciesla - 2.7.0-1 - 2.7.0 diff --git a/sources b/sources index 85875e3..b2f76b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.7.0.tar.gz) = f3de85bd041857bfdeb586edcb7b6f700e37cf3bc86bbcbde374eb4aaaa1f1d367b829ee23f299a545c57db5b3de504816c705d4f51bf3be547f79a2d0e99010 +SHA512 (atop-2.7.1.tar.gz) = f5013dbc25b86f07c9892555705bb3db2eeb949478f53e6e5545308b0c7c173c4c7a8ed0eae1f173e075210f81fceee09d7a9d90de76c4f011e38ad4a76b780b From 46b2d7eefd016ecb62fae616d3cedc43dfc88d07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:53:38 +0000 Subject: [PATCH 21/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 1dc453e..592798f 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 11 2022 Gwyn Ciesla - 2.7.1-1 - 2.7.1 - Drop atopgpud as it requires proprietary NVIDIA drivers. From 3416fcec55855fef45491fbc2f21e6b020c6cc12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:30:22 +0000 Subject: [PATCH 22/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 592798f..ace6795 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 8f8fe77667ae46ecdd4c9404b0280079f95fb8e6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 7 Dec 2022 12:36:59 -0600 Subject: [PATCH 23/42] Include atopacctd man page. --- atop.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index ace6795..b39a252 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -60,6 +60,7 @@ install -Dp -m 0755 atopconvert $RPM_BUILD_ROOT%{_bindir}/atopconvert ln -s atop $RPM_BUILD_ROOT%{_bindir}/atopsar install -Dp -m 0644 man/atop.1 $RPM_BUILD_ROOT%{_mandir}/man1/atop.1 install -Dp -m 0644 man/atopsar.1 $RPM_BUILD_ROOT%{_mandir}/man1/atopsar.1 +install -Dp -m 0644 man/atopacctd.8 $RPM_BUILD_ROOT%{_mandir}/man8/atopacctd.8 install -Dp -m 0755 atop.daily $RPM_BUILD_ROOT%{_datadir}/atop/atop.daily install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop install -Dp -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/atopd @@ -106,6 +107,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %{_bindir}/atopconvert %{_mandir}/man1/atop.1.gz %{_mandir}/man1/atopsar.1.gz +%{_mandir}/man8/atopacctd.8.gz %attr(0755,root,root) %dir %{_localstatedir}/log/atop %{_unitdir}/atop*.service %{_unitdir}/atop*.timer @@ -116,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Dec 07 2022 Gwyn Ciesla - 2.7.1-4 +- Include atopacctd man page + * Wed Jul 20 2022 Fedora Release Engineering - 2.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d328ce2d6873508205aaa1f241ae51905d414f73 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 3 Jan 2023 15:51:04 -0600 Subject: [PATCH 24/42] 2.8.0 --- .gitignore | 1 + atop.spec | 19 ++++++++++--------- nvme_support.patch | 11 ----------- sources | 2 +- 4 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 nvme_support.patch diff --git a/.gitignore b/.gitignore index d606f84..8747407 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ atop-1.23.tar.gz /atop-2.6.0.tar.gz /atop-2.7.0.tar.gz /atop-2.7.1.tar.gz +/atop-2.8.0.tar.gz diff --git a/atop.spec b/atop.spec index b39a252..a5ce588 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.7.1 -Release: 4%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -10,9 +10,8 @@ URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d -Patch0: nvme_support.patch -Patch1: atop-sysconfig.patch -Patch2: atop-2.3.0-newer-gcc.patch +Patch0: atop-sysconfig.patch +Patch1: atop-2.3.0-newer-gcc.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -44,9 +43,8 @@ performance-monitors: %prep %setup -q -%patch0 -p0 -b .nvme -%patch1 -p0 -b .sysconfig -%patch2 -p1 -b .newer-gcc +%patch0 -p0 -b .sysconfig +%patch1 -p1 -b .newer-gcc # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -99,7 +97,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %else %license COPYING %endif -%doc AUTHOR README* +%doc AUTHORS README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -118,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Tue Jan 03 2023 Gwyn Ciesla - 2.8.0-1 +- 2.8.0 + * Wed Dec 07 2022 Gwyn Ciesla - 2.7.1-4 - Include atopacctd man page diff --git a/nvme_support.patch b/nvme_support.patch deleted file mode 100644 index bc144a6..0000000 --- a/nvme_support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./photosyst.c.orig ./photosyst.c ---- ./photosyst.c.orig 2017-03-25 11:00:03.000000003 +0200 -+++ ./photosyst.c 2017-12-08 01:31:13.795157092 +0200 -@@ -1537,6 +1537,7 @@ static struct { - { "^dasd[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, - { "^mmcblk[0-9][0-9]*$", {0}, nullmodname, DSKTYPE, }, - { "^emcpower[a-z][a-z]*$", {0}, nullmodname, DSKTYPE, }, -+ { "^nvme[0-9][a-z][0-9]*$", {0}, nullmodname, DSKTYPE, }, - }; - - static int diff --git a/sources b/sources index b2f76b0..73a5e0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.7.1.tar.gz) = f5013dbc25b86f07c9892555705bb3db2eeb949478f53e6e5545308b0c7c173c4c7a8ed0eae1f173e075210f81fceee09d7a9d90de76c4f011e38ad4a76b780b +SHA512 (atop-2.8.0.tar.gz) = b9fee4c38f680f2d3a75b46627b9149ef83defdbbf5405dbedb7cc71718de2020be328354ad03bcdf48a738b96dd1a8d64610a2138649cb169263bb5cc97bff0 From 15ebd2553034129dc2e2f55a846c24d6e43e78a6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 9 Jan 2023 08:55:21 -0600 Subject: [PATCH 25/42] 2.8.1 --- .gitignore | 1 + atop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8747407..b3089e2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ atop-1.23.tar.gz /atop-2.7.0.tar.gz /atop-2.7.1.tar.gz /atop-2.8.0.tar.gz +/atop-2.8.1.tar.gz diff --git a/atop.spec b/atop.spec index a5ce588..1f1372e 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jan 09 2023 Gwyn Ciesla - 2.8.1-1 +- 2.8.1 + * Tue Jan 03 2023 Gwyn Ciesla - 2.8.0-1 - 2.8.0 diff --git a/sources b/sources index 73a5e0b..a38663b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.8.0.tar.gz) = b9fee4c38f680f2d3a75b46627b9149ef83defdbbf5405dbedb7cc71718de2020be328354ad03bcdf48a738b96dd1a8d64610a2138649cb169263bb5cc97bff0 +SHA512 (atop-2.8.1.tar.gz) = d84c1e7f5ba9fd1809b3c1b69db89d596d7df5a9035cc21f12c98ef623dfef90e23756f1f7fc5903234760c75f64b1c6ba314700c41a5cfd09141f16524106cd From 9dfc7630cfb1bd495f13cf8ff93ea46328def196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:24:36 +0000 Subject: [PATCH 26/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 1f1372e..f0c0bd8 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPLv2+ @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Gwyn Ciesla - 2.8.1-1 - 2.8.1 From 8d0ea1bcf9e0960e68b95c6bf054da9777a354b2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 4 Mar 2023 20:03:36 -0600 Subject: [PATCH 27/42] migrated to SPDX license --- atop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/atop.spec b/atop.spec index f0c0bd8..5ffd894 100644 --- a/atop.spec +++ b/atop.spec @@ -2,10 +2,10 @@ Name: atop Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level -License: GPLv2+ +License: GPL-2.0-or-later URL: https://www.atoptool.nl Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d @@ -116,6 +116,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Sun Mar 05 2023 Gwyn Ciesla - 2.8.1-3 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 2.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4e177691f2690b3f0d79487e3d731a51c9f3c408 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 15 May 2023 10:46:06 -0500 Subject: [PATCH 28/42] 2.9.0 --- .gitignore | 1 + atop.spec | 13 +++++++++---- format.patch | 33 +++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 format.patch diff --git a/.gitignore b/.gitignore index b3089e2..fb5d8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ atop-1.23.tar.gz /atop-2.7.1.tar.gz /atop-2.8.0.tar.gz /atop-2.8.1.tar.gz +/atop-2.9.0.tar.gz diff --git a/atop.spec b/atop.spec index 5ffd894..b503481 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.8.1 -Release: 3%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -12,6 +12,7 @@ Source1: atop.d Patch0: atop-sysconfig.patch Patch1: atop-2.3.0-newer-gcc.patch +Patch2: format.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -43,8 +44,9 @@ performance-monitors: %prep %setup -q -%patch0 -p0 -b .sysconfig -%patch1 -p1 -b .newer-gcc +%patch -P 0 -p0 -b .sysconfig +%patch -P 1 -p1 -b .newer-gcc +%patch -P 2 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service @@ -116,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon May 15 2023 Gwyn Ciesla - 2.9.0-1 +- 2.9.0 + * Sun Mar 05 2023 Gwyn Ciesla - 2.8.1-3 - migrated to SPDX license diff --git a/format.patch b/format.patch new file mode 100644 index 0000000..1ebf658 --- /dev/null +++ b/format.patch @@ -0,0 +1,33 @@ +--- drawbar.c~ 2023-05-13 03:20:27.000000000 -0500 ++++ drawbar.c 2023-05-15 10:34:00.882788701 -0500 +@@ -2105,7 +2105,7 @@ + { + colorswon(headwin, statuscol); + wattron(headwin, A_REVERSE); +- mvwprintw(headwin, 0, statcol, statusmsg); ++ mvwprintw(headwin, 0, statcol, "%s", statusmsg); + wattroff(headwin, A_REVERSE); + colorswoff(headwin, statuscol); + } +--- drawbar.c~ 2023-05-15 10:34:51.232378376 -0500 ++++ drawbar.c 2023-05-15 10:35:14.888185588 -0500 +@@ -2055,7 +2055,7 @@ + + line -= 1; + wattron(w->win, A_BOLD); +- mvwprintw(w->win, line, column, text); ++ mvwprintw(w->win, line, column, "%s", text); + wattroff(w->win, A_BOLD); + + colorswoff(w->win, color); +--- drawbar.c~ 2023-05-15 10:35:14.888185588 -0500 ++++ drawbar.c 2023-05-15 10:35:35.821014989 -0500 +@@ -2328,7 +2328,7 @@ + + // show the prompt + // +- mvwprintw(mywin, 1, 1, prompt); ++ mvwprintw(mywin, 1, 1, "%s", prompt); + + // prepare reading input + // diff --git a/sources b/sources index a38663b..e6c9016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.8.1.tar.gz) = d84c1e7f5ba9fd1809b3c1b69db89d596d7df5a9035cc21f12c98ef623dfef90e23756f1f7fc5903234760c75f64b1c6ba314700c41a5cfd09141f16524106cd +SHA512 (atop-2.9.0.tar.gz) = 460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee From f26edcb2b9a48a552024ba9e5c677670f5233dfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:04:30 +0000 Subject: [PATCH 29/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index b503481..aabf53c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -118,6 +118,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon May 15 2023 Gwyn Ciesla - 2.9.0-1 - 2.9.0 From 644589bbd00c1e4ec4cf41466aadee145bcdf65a Mon Sep 17 00:00:00 2001 From: Nikola Kolev Date: Mon, 7 Aug 2023 22:06:22 +0000 Subject: [PATCH 30/42] Remove redundant patch --- atop-2.3.0-newer-gcc.patch | 35 ----------------------------------- atop.spec | 6 ++---- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 atop-2.3.0-newer-gcc.patch diff --git a/atop-2.3.0-newer-gcc.patch b/atop-2.3.0-newer-gcc.patch deleted file mode 100644 index efa1858..0000000 --- a/atop-2.3.0-newer-gcc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7bf30c52a37118ff4f211e67e1736099f3d1dcb3 Mon Sep 17 00:00:00 2001 -From: Gerlof Langeveld -Date: Sat, 22 Sep 2018 11:50:50 +0200 -Subject: [PATCH] Own macro's added to determine major/minor of logical volume. - The standard 'minor' and 'major' macro's are not available any more in gcc8. - ---- - photosyst.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/photosyst.c b/photosyst.c -index 19cbbe1..019b9e0 100644 ---- a/photosyst.c -+++ b/photosyst.c -@@ -184,6 +184,9 @@ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof - - #define MAXCNT 64 - -+#define MAJOR(x) ((((unsigned long long)x>>8)&0xfff)|((unsigned int)((unsigned long long)x>>32)&~0xfff)) -+#define MINOR(x) ((x&0xff)|((unsigned int)((unsigned long long)x>>12)&~0xff)) -+ - /* return value of isdisk() */ - #define NONTYPE 0 - #define DSKTYPE 1 -@@ -1479,8 +1482,8 @@ lvmmapname(unsigned int major, unsigned int minor, - */ - strncpy(dmp->name, dentry->d_name, MAXDKNAM); - dmp->name[MAXDKNAM-1] = 0; -- dmp->major = major(statbuf.st_rdev); -- dmp->minor = minor(statbuf.st_rdev); -+ dmp->major = MAJOR(statbuf.st_rdev); -+ dmp->minor = MINOR(statbuf.st_rdev); - - hashix = DMHASH(dmp->major, dmp->minor); - diff --git a/atop.spec b/atop.spec index aabf53c..1450d79 100644 --- a/atop.spec +++ b/atop.spec @@ -11,8 +11,7 @@ Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: atop-sysconfig.patch -Patch1: atop-2.3.0-newer-gcc.patch -Patch2: format.patch +Patch1: format.patch BuildRequires: gcc BuildRequires: zlib-devel @@ -45,8 +44,7 @@ performance-monitors: %prep %setup -q %patch -P 0 -p0 -b .sysconfig -%patch -P 1 -p1 -b .newer-gcc -%patch -P 2 -p0 -b .format +%patch -P 1 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service From 9314ec167348cf764f2d598c26924246b907699c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Jan 2024 14:30:44 -0600 Subject: [PATCH 31/42] 2.10.0 --- .gitignore | 1 + atop.spec | 16 +++++++++------- format.patch | 33 --------------------------------- sources | 2 +- 4 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 format.patch diff --git a/.gitignore b/.gitignore index fb5d8a4..f278297 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ atop-1.23.tar.gz /atop-2.8.0.tar.gz /atop-2.8.1.tar.gz /atop-2.9.0.tar.gz +/atop-2.10.0.tar.gz diff --git a/atop.spec b/atop.spec index 1450d79..35b427d 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.9.0 -Release: 2%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -11,13 +11,13 @@ Source0: https://www.atoptool.nl/download/%{name}-%{version}.tar.gz Source1: atop.d Patch0: atop-sysconfig.patch -Patch1: format.patch BuildRequires: gcc BuildRequires: zlib-devel -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel +BuildRequires: glib2-devel BuildRequires: systemd -BuildRequires: make +BuildRequires: make #%%if 0%%{?rhel} >= 8 || 0%%{?fedora} #Requires: python3-py3nvml #%%endif @@ -44,13 +44,12 @@ performance-monitors: %prep %setup -q %patch -P 0 -p0 -b .sysconfig -%patch -P 1 -p0 -b .format # Correct unit file path sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I." %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop @@ -116,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Thu Jan 04 2024 Gwyn Ciesla - 2.10.0-1 +- 2.10.0 + * Wed Jul 19 2023 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/format.patch b/format.patch deleted file mode 100644 index 1ebf658..0000000 --- a/format.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- drawbar.c~ 2023-05-13 03:20:27.000000000 -0500 -+++ drawbar.c 2023-05-15 10:34:00.882788701 -0500 -@@ -2105,7 +2105,7 @@ - { - colorswon(headwin, statuscol); - wattron(headwin, A_REVERSE); -- mvwprintw(headwin, 0, statcol, statusmsg); -+ mvwprintw(headwin, 0, statcol, "%s", statusmsg); - wattroff(headwin, A_REVERSE); - colorswoff(headwin, statuscol); - } ---- drawbar.c~ 2023-05-15 10:34:51.232378376 -0500 -+++ drawbar.c 2023-05-15 10:35:14.888185588 -0500 -@@ -2055,7 +2055,7 @@ - - line -= 1; - wattron(w->win, A_BOLD); -- mvwprintw(w->win, line, column, text); -+ mvwprintw(w->win, line, column, "%s", text); - wattroff(w->win, A_BOLD); - - colorswoff(w->win, color); ---- drawbar.c~ 2023-05-15 10:35:14.888185588 -0500 -+++ drawbar.c 2023-05-15 10:35:35.821014989 -0500 -@@ -2328,7 +2328,7 @@ - - // show the prompt - // -- mvwprintw(mywin, 1, 1, prompt); -+ mvwprintw(mywin, 1, 1, "%s", prompt); - - // prepare reading input - // diff --git a/sources b/sources index e6c9016..322780e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.9.0.tar.gz) = 460e9594bedb552b8e692d2118d38c47e629f435848fa0d6f2f2d83cafcb19c5b77c419a2b9067a39251c5af2fa955f998074efa616221c010428ec07bb3acee +SHA512 (atop-2.10.0.tar.gz) = 72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4 From 08096aa8894ccb4008a1b3fc02061f80687ed62a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:51:15 +0000 Subject: [PATCH 32/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 35b427d..b57c46c 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 04 2024 Gwyn Ciesla - 2.10.0-1 - 2.10.0 From d8f97cf14a5ae23f69d441f1559da4875c3a5376 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:46:47 +0000 Subject: [PATCH 33/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index b57c46c..0ea4f00 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2ff6c7ccdb61778fd630108be5571bb47713bc23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:46:04 +0000 Subject: [PATCH 34/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 0ea4f00..dcd3700 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 34d28480d05969afdfb994f43c24ab525dbd8169 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 29 Jul 2024 13:54:21 -0500 Subject: [PATCH 35/42] 2.11.0 --- .gitignore | 1 + atop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f278297..2268628 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ atop-1.23.tar.gz /atop-2.8.1.tar.gz /atop-2.9.0.tar.gz /atop-2.10.0.tar.gz +/atop-2.11.0.tar.gz diff --git a/atop.spec b/atop.spec index dcd3700..e4f5763 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jul 29 2024 Gwyn Ciesla - 2.11.0-1 +- 2.11.0 + * Wed Jul 17 2024 Fedora Release Engineering - 2.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 322780e..5c10caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.10.0.tar.gz) = 72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4 +SHA512 (atop-2.11.0.tar.gz) = f43881fcc9fa8bfe6837bd8228b9fc7fc7679f84e51af80ab5e9f89915e254fbf6e24c7bf78c22814d8d9db5b012d46ca75ff5abe1dfde3b51d94fa29fed077a From 5647d2621c369f38d488cd3bb2e17b7bfc9d2f90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:54:37 +0000 Subject: [PATCH 36/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index e4f5763..c9553b3 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -115,6 +115,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Gwyn Ciesla - 2.11.0-1 - 2.11.0 From bdd4cb343f7a57bc9a408996c3cbcf2da0ce9be9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Jan 2025 12:28:22 -0600 Subject: [PATCH 37/42] fix FTBFS --- atop.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/atop.spec b/atop.spec index c9553b3..2db4781 100644 --- a/atop.spec +++ b/atop.spec @@ -18,9 +18,6 @@ BuildRequires: ncurses-devel BuildRequires: glib2-devel BuildRequires: systemd BuildRequires: make -#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} -#Requires: python3-py3nvml -#%%endif Requires(post): systemd Requires(preun): systemd @@ -49,7 +46,7 @@ performance-monitors: sed -i "s|/etc/default/atop|/etc/sysconfig/atop|g" atop.service %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I." +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS $(pkg-config --cflags glib-2.0) -I. -std=gnu17" %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop From 697cb12daf2cd6749c7949e17cbce701e716a4d9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 31 Mar 2025 08:49:24 -0500 Subject: [PATCH 38/42] 2.11.1 --- .gitignore | 1 + atop.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2268628..a220581 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ atop-1.23.tar.gz /atop-2.9.0.tar.gz /atop-2.10.0.tar.gz /atop-2.11.0.tar.gz +/atop-2.11.1.tar.gz diff --git a/atop.spec b/atop.spec index 2db4781..2473220 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.11.0 -Release: 2%{?dist} +Version: 2.11.1 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -93,7 +93,7 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ %else %license COPYING %endif -%doc AUTHORS README* +%doc README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Mar 31 2025 Gwyn Ciesla - 2.11.1-1 +- 2.11.1 + * Thu Jan 16 2025 Fedora Release Engineering - 2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 5c10caa..1be10d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.11.0.tar.gz) = f43881fcc9fa8bfe6837bd8228b9fc7fc7679f84e51af80ab5e9f89915e254fbf6e24c7bf78c22814d8d9db5b012d46ca75ff5abe1dfde3b51d94fa29fed077a +SHA512 (atop-2.11.1.tar.gz) = 6c3301ecc7fa261bc9f9a9d285315b048aa56fdf94629b1e4ad2634b0cf048d70afe7813b1a44506756d6af05b8b78df76df995aa6f4c404bf01fd6225839a3d From 69cf1d15deb198d087ffe866668f3bf3d9c62dbe Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 16 Jun 2025 10:35:48 -0500 Subject: [PATCH 39/42] 2.12.0 --- .gitignore | 1 + atop.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a220581..59844ce 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ atop-1.23.tar.gz /atop-2.10.0.tar.gz /atop-2.11.0.tar.gz /atop-2.11.1.tar.gz +/atop-2.12.0.tar.gz diff --git a/atop.spec b/atop.spec index 2473220..9e4fd91 100644 --- a/atop.spec +++ b/atop.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: atop -Version: 2.11.1 +Version: 2.12.0 Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Mon Jun 16 2025 Gwyn Ciesla - 2.12.0-1 +- 2.12.0 + * Mon Mar 31 2025 Gwyn Ciesla - 2.11.1-1 - 2.11.1 diff --git a/sources b/sources index 1be10d8..28b0272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.11.1.tar.gz) = 6c3301ecc7fa261bc9f9a9d285315b048aa56fdf94629b1e4ad2634b0cf048d70afe7813b1a44506756d6af05b8b78df76df995aa6f4c404bf01fd6225839a3d +SHA512 (atop-2.12.0.tar.gz) = d0cee89b6d187b853726d025ddedb067a91aa4b71195e125d2a4a2d9057acd149b92f48a5d633729e36634c70d60334ce72f73ef8051861ba4c7e482e17cd5ff From ecd35340fe48b2d188bbaade49c087ff2ce223dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:24:31 +0000 Subject: [PATCH 40/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 9e4fd91..6eb17f0 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 16 2025 Gwyn Ciesla - 2.12.0-1 - 2.12.0 From 384c53ff7b54aabf4c905372ed132fbfdbf12ae3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 23 Sep 2025 14:02:50 -0500 Subject: [PATCH 41/42] 2.12.1 --- .gitignore | 1 + atop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59844ce..6afb65f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ atop-1.23.tar.gz /atop-2.11.0.tar.gz /atop-2.11.1.tar.gz /atop-2.12.0.tar.gz +/atop-2.12.1.tar.gz diff --git a/atop.spec b/atop.spec index 6eb17f0..6ff8297 100644 --- a/atop.spec +++ b/atop.spec @@ -1,8 +1,8 @@ %define _hardened_build 1 Name: atop -Version: 2.12.0 -Release: 2%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Tue Sep 23 2025 Gwyn Ciesla - 2.12.1-1 +- 2.12.1 + * Wed Jul 23 2025 Fedora Release Engineering - 2.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 28b0272..5ba284b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.12.0.tar.gz) = d0cee89b6d187b853726d025ddedb067a91aa4b71195e125d2a4a2d9057acd149b92f48a5d633729e36634c70d60334ce72f73ef8051861ba4c7e482e17cd5ff +SHA512 (atop-2.12.1.tar.gz) = e01db51bf025598e7bad585f62761e10d23a77f6c7be96418bc8919a72c74628851ae5cbdc0c12ed752f80b44f5b72f2102692dbbb3210cacc59b32340107ce7 From 8a5871f434992a55951824863d4956d2a44479be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:06:36 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- atop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atop.spec b/atop.spec index 6ff8297..c7c32b4 100644 --- a/atop.spec +++ b/atop.spec @@ -2,7 +2,7 @@ Name: atop Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level License: GPL-2.0-or-later @@ -112,6 +112,9 @@ install -Dp -m 0644 atop-rotate.* $RPM_BUILD_ROOT%{_unitdir}/ #%%endif %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 23 2025 Gwyn Ciesla - 2.12.1-1 - 2.12.1