diff --git a/.gitignore b/.gitignore index 2aa42b8..539cea3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ atop-1.23.tar.gz /atop-1.26.tar.gz /atop-2.0.2.tar.gz /atop-2.1.tar.gz +/atop-2.2-3.tar.gz diff --git a/atop.logrotate b/atop.logrotate index 6253c74..d558e42 100644 --- a/atop.logrotate +++ b/atop.logrotate @@ -2,6 +2,7 @@ missingok weekly rotate 4 + maxage 28 notifempty create 0600 root root } diff --git a/atop.spec b/atop.spec index b585637..dce009d 100644 --- a/atop.spec +++ b/atop.spec @@ -1,14 +1,14 @@ %define _hardened_build 1 Name: atop -Version: 2.1 -Release: 3%{?dist} +Version: 2.2 +Release: 1%{?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 +Source0: http://www.atcomputing.nl/download/%{name}-%{version}-3.tar.gz Source1: atop.logrotate #Source2: atop.init Source3: atop.crondaily @@ -17,7 +17,7 @@ Source5: atop.d Source6: atop.service Source7: README.fedora -Patch0: atop-1.26-cron.patch +#Patch0: atop-1.26-cron.patch BuildRequires: zlib-devel BuildRequires: ncurses-devel @@ -47,8 +47,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html %prep -%setup -q -%patch0 -p0 -b .cron +%setup -qn atop-2.2-3 +#%patch0 -p1 -b .cron %build @@ -60,7 +60,7 @@ install -Dp -m 0755 atop $RPM_BUILD_ROOT%{_bindir}/atop 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.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop +install -Dp -m 0644 atop.cronsystemd $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/atop install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/atop #install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/atop #install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/atop/atop.daily @@ -103,6 +103,10 @@ install -m 0644 %{SOURCE7} . %changelog +* Wed Dec 21 2016 Jon Ciesla - 2.2-1 +- Fix logrotate, 1247869 +- 2.2 + * Wed Feb 03 2016 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index f382000..2bbc5d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d956f5b0c7e0705cff6cf44898d664d7 atop-2.1.tar.gz +SHA512 (atop-2.2-3.tar.gz) = 34076e35004367bbfd63f3aac1e786dab566633799b5d4f2c4d45f343642d145027f6298aa40d5e83c1356f502e3c51faa58da07cea58f2960bfacd78cf77915