[atop] Drop logrotate, fix cron.

[Jon Ciesla]

commit 4e0c51b8022b55d34cb705c61d1d066bd2ce04a3
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed May 9 08:07:06 2012 -0500

    Drop logrotate, fix cron.

 atop.spec |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/atop.spec b/atop.spec
index a2a9925..eaf30a8 100644
--- a/atop.spec
+++ b/atop.spec
@@ -1,20 +1,20 @@
 %define _hardened_build 1
 Name:           atop
 Version:        1.26
-Release:        3%{?dist}
+Release:        4%{?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/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
+#Patch0:         atop-1.23-cron.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -46,7 +46,7 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html
  
 %prep
 %setup -q
-%patch0 -p1 -b .cron
+#%patch0 -p1 -b .cron
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -58,9 +58,9 @@ 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}/cron.daily/atop
+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
@@ -104,9 +104,9 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHOR COPYING README ChangeLog
 %config(noreplace) %{_sysconfdir}/cron.d/atop
-%config(noreplace) %{_sysconfdir}/logrotate.d/atop
+#%config(noreplace) %{_sysconfdir}/logrotate.d/atop
 %config(noreplace) %{_sysconfdir}/sysconfig/atop
-%{_sysconfdir}/cron.daily/atop
+%{_sysconfdir}/atop/atop.daily
 #%{_initrddir}/atop
 %{_bindir}/atopsar
 %{_bindir}/atop
@@ -117,6 +117,10 @@ fi
 %{_unitdir}/atop.service
 
 %changelog
+* Wed May 09 2012 Jon Ciesla <limburgher at gmail.com> - 1.26-4
+- Dropped logrotate, conflicts with atop's logging, BZ 542598.
+- Corrected cron config, BZ 819523.
+
 * Fri Apr 13 2012 Jon Ciesla <limburgher at gmail.com> - 1.26-3
 - Add hardened build.