From e006c97688047be8f517beddeb7df3186f18db29 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:01:48 +0000
Subject: [PATCH] auto-import changelog data from logwatch-2.6-2.src.rpm Mon
 Apr 15 2002 Elliot Lee <sopwith@redhat.com> 2.6-2 - Fix #62787
 (logwatch-2.6-newline-62787.patch) and #63279    
 (logwatch-2.6-applystddate-63279.patch)

---
 logwatch.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/logwatch.spec b/logwatch.spec
index 0d03a28..8f1b9ca 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,12 +1,14 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 2.6
-Release: 1
+Release: 2
 Copyright: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 Source: ftp://ftp.kaybee.org/pub/linux/logwatch-2.6.tar.gz
 Patch: logwatch-2.6-mktemp.patch
+Patch1: logwatch-2.6-newline-62787.patch
+Patch2: logwatch-2.6-applystddate-63279.patch
 Requires: perl,textutils,sh-utils,grep,mailx
 BuildRoot: %{_tmppath}/logwatch-build
 BuildArchitectures: noarch
@@ -22,6 +24,8 @@ analyzes Samba logs.
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf %{buildroot}
@@ -30,12 +34,10 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/services
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/services
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/shared
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/xferlog
-install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/cron
 install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/samba
 
 install -m 0755 scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/scripts/logwatch.pl
 install -m 0755 scripts/logfiles/xferlog/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/xferlog
-install -m 0755 scripts/logfiles/cron/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/cron
 install -m 0755 scripts/logfiles/samba/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/samba
 install -m 0755 scripts/services/* %{buildroot}%{_sysconfdir}/log.d/scripts/services
 install -m 0755 scripts/shared/* %{buildroot}%{_sysconfdir}/log.d/scripts/shared
@@ -77,7 +79,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/log.d/scripts/services
 %dir %{_sysconfdir}/log.d/scripts/shared
 %dir %{_sysconfdir}/log.d/scripts/logfiles/xferlog
-%dir %{_sysconfdir}/log.d/scripts/logfiles/cron
 %dir %{_sysconfdir}/log.d/scripts/logfiles/samba
 %config %{_sysconfdir}/log.d/conf/logwatch.conf
 %config %{_sysconfdir}/log.d/conf/services/*
@@ -87,7 +88,6 @@ rm -rf %{buildroot}
 %{_sysconfdir}/log.d/scripts/shared/*
 %{_sysconfdir}/log.d/scripts/services/*
 %{_sysconfdir}/log.d/scripts/logfiles/xferlog/*
-%{_sysconfdir}/log.d/scripts/logfiles/cron/*
 %{_sysconfdir}/log.d/scripts/logfiles/samba/*
 %{_sysconfdir}/log.d/logwatch
 %{_sysconfdir}/log.d/logwatch.conf
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Apr 15 2002 Elliot Lee <sopwith@redhat.com> 2.6-2
+- Fix #62787 (logwatch-2.6-newline-62787.patch) and #63279 (logwatch-2.6-applystddate-63279.patch)
+
 * Sun Mar 31 2002 Elliot Lee <sopwith@redhat.com> 2.6-1
 - Don't trust homebaked tempdir creation - always use mktemp.