[atop/el5] Cron and logrotate fixes.

[Jon Ciesla]

commit 8fcbe8e7ec84dede79e6f036b476c177f2d7a030
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri May 11 07:54:16 2012 -0500

    Cron and logrotate fixes.

 atop.logrotate |    9 +--------
 atop.spec      |   24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/atop.logrotate b/atop.logrotate
index bc9caa4..6253c74 100644
--- a/atop.logrotate
+++ b/atop.logrotate
@@ -2,13 +2,6 @@
     missingok
     weekly
     rotate 4 
-    ifempty
-    create 0600 root root
-}
-/var/log/atop/atop_* {
-    missingok
-    daily
-    rotate 1
-    ifempty
+    notifempty
     create 0600 root root
 }
diff --git a/atop.spec b/atop.spec
index 3d6560c..2ab13ab 100644
--- a/atop.spec
+++ b/atop.spec
@@ -1,19 +1,20 @@
 Name:           atop
 Version:        1.26
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 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/Tools/%{name}/packages/%{name}-%{version}.tar.gz
-#Source1:        atop.logrotate
+Source1:        atop.logrotate
 Source2:        atop.init
 Source3:        atop.crondaily
 Source4:        atop.sysconfig
 Source5:        atop.d
 #Source6:        atop.service
-#Patch0:         atop-1.23-cron.patch
+Source7:        README.fedora
+Patch0:         atop-1.26-cron.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -49,7 +50,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html
  
 %prep
 %setup -q
-#%patch0 -p1 -b .cron
+%patch0 -p0 -b .cron
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -61,13 +62,14 @@ 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 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.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
+#install -Dp -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/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 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/atop.service
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/atop
+install -m 0644 %{SOURCE7} .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,11 +111,11 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHOR COPYING README ChangeLog
+%doc AUTHOR COPYING README ChangeLog README.fedora
 %config(noreplace) %{_sysconfdir}/cron.d/atop
-#%config(noreplace) %{_sysconfdir}/logrotate.d/atop
+%config(noreplace) %{_sysconfdir}/logrotate.d/atop
 %config(noreplace) %{_sysconfdir}/sysconfig/atop
-%{_sysconfdir}/atop/atop.daily
+#%{_sysconfdir}/atop/atop.daily
 %{_initrddir}/atop
 %{_bindir}/atopsar
 %{_bindir}/atop
@@ -124,6 +126,10 @@ fi
 #%{_unitdir}/atop.service
 
 %changelog
+* Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 1.26-2.1
+- Re-add atop.log logrotate section.
+- Modify cron setup per BZ 445174 comment #6.
+
 * Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 1.26-2
 - Dropped logrotate, conflicts with atop's logging, BZ 542598.
 - Corrected cron config, BZ 819523.