diff --git a/.gitignore b/.gitignore index 07400d5..6afb65f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,16 @@ atop-1.23.tar.gz /atop-2.1.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 +/atop-2.6.0.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 +/atop-2.9.0.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 +/atop-2.12.1.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-sysconfig.patch b/atop-sysconfig.patch index aabc017..6253b04 100644 --- a/atop-sysconfig.patch +++ b/atop-sysconfig.patch @@ -1,12 +1,11 @@ ---- atop.daily~ 2017-03-25 04:00:03.000000000 -0500 -+++ atop.daily 2017-12-08 09:56:09.231136938 -0600 -@@ -6,6 +6,9 @@ - PIDFILE=/var/run/atop.pid - INTERVAL=600 # interval 10 minutes - -+# support /etc/sysconfig/atop -+source /etc/sysconfig/atop -+ - # verify if atop still runs for daily logging +--- atop.daily~ 2019-01-12 16:37:19.000000000 -0600 ++++ atop.daily 2019-02-25 15:33:13.243363452 -0600 +@@ -7,7 +7,7 @@ + # allow administrator to overrule the variables + # defined above # - if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null +-DEFAULTSFILE=/etc/default/atop # possibility to overrule vars ++DEFAULTSFILE=/etc/sysconfig/atop # possibility to overrule vars + + if [ -e "$DEFAULTSFILE" ] + then diff --git a/atop.spec b/atop.spec index 5a42bbb..c7c32b4 100644 --- a/atop.spec +++ b/atop.spec @@ -1,24 +1,23 @@ %define _hardened_build 1 Name: atop -Version: 2.3.0 -Release: 8%{?dist} +Version: 2.12.1 +Release: 2%{?dist} Summary: An advanced interactive monitor to view the load on system and process level -Group: Applications/System -License: GPLv2+ -URL: http://www.atcomputing.nl/Tools/atop/ -Source0: http://www.atcomputing.nl/download/%{name}-%{version}.tar.gz -Source4: atop.sysconfig -Source5: atop.d +License: GPL-2.0-or-later +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-restart.patch +Patch0: atop-sysconfig.patch +BuildRequires: gcc BuildRequires: zlib-devel -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel +BuildRequires: glib2-devel BuildRequires: systemd +BuildRequires: make Requires(post): systemd Requires(preun): systemd @@ -38,63 +37,209 @@ 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 -%patch0 -p0 -b .nvme -%patch1 -p0 -b .sysconfig -%patch2 -p0 -b .cron +%patch -P 0 -p0 -b .sysconfig + +# 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. -std=gnu17" %install install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop +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 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 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop -install -Dp -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/atopd +install -Dp -m 0644 atop.default $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/atop +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 +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 atop.service atopacct.service atop-rotate.timer +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_post atopgpu.service +#%%endif %preun -%systemd_preun atop.service +%systemd_preun atop.service atopacct.service atop-rotate.timer +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%systemd_preun atopgpu.service +#%%endif %postun -%systemd_postun_with_restart atop.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 %files -%if 0%{?rhel} || 0%{?fedora} < 21 +%if 0%{?rhel} %doc COPYING %else %license COPYING %endif -%doc AUTHOR README ChangeLog -%config(noreplace) %{_sysconfdir}/cron.d/atop +%doc README* %config(noreplace) %{_sysconfdir}/sysconfig/atop %{_bindir}/atopsar %{_bindir}/atop %{_bindir}/atopd +%{_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*.service +%{_unitdir}/atop*.timer %{_datadir}/atop/atop.daily +%{_sbindir}/atopacctd +#%%if 0%%{?rhel} >= 8 || 0%%{?fedora} +#%%{_sbindir}/atopgpud +#%%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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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. + +* 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 +- 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 + +* 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 + +* 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 + +* 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. + +* Wed Aug 28 2019 Gwyn Ciesla - 2.4.0-3 +- Fix LOGINTERVAL in sysconfig. + +* Wed Jul 24 2019 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 25 2019 Gwyn Ciesla - 2.4.0-1 +- 2.4.0: omitting atopgpud until nvidia-ml-py is in Fedora. + +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Sep 14 2018 Filipe Rosset - 2.3.0-12 +- Fix FTBFS rhbz #1603433 + +* Thu Jul 12 2018 Fedora Release Engineering - 2.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 2.3.0-10 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 2.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Dec 29 2017 Gwyn Ciesla - 2.3.0-8 - Apply the patch from the previous ENVR. @@ -235,7 +380,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop * Sun Jan 27 2008 Kairo Araujo - 1.22-2 - corrected license tag to GPLv2+ - replaced references to atop (init file) -- rebuild with Fedora mandatory flags (make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") +- rebuild with Fedora mandatory flags (make %%{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS") - chkconfig and service added at pre/post scriptlets - improved name in logrotate file configuration - corrected english description diff --git a/atop.sysconfig b/atop.sysconfig deleted file mode 100644 index 12d376a..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) -INTERVAL=600 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 3466098..5ba284b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atop-2.3.0.tar.gz) = 51cc868545403cab439a66cc38fe9324c6ff7537e6dad5271fa3f0a22cbad471b0e15186d4f78f0080129301ba0a59e0c1cd1cc694bc3a4f982118a8d0cae429 +SHA512 (atop-2.12.1.tar.gz) = e01db51bf025598e7bad585f62761e10d23a77f6c7be96418bc8919a72c74628851ae5cbdc0c12ed752f80b44f5b72f2102692dbbb3210cacc59b32340107ce7