rpms/logwatch/FC-3 logwatch-5.2.2-yum.patch, NONE, 1.1 logwatch.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/logwatch/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv12524

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-5.2.2-yum.patch 
Log Message:
 - fix the second part of 169057 bug - logwatch does not report
   yum service log



logwatch-5.2.2-yum.patch:
 conf/logfiles/yum.conf           |    1 
 scripts/logfiles/yum/applyupdate |   47 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-5.2.2-yum.patch ---
--- logwatch-5.2.2/scripts/logfiles/yum/applyupdate.pom	2005-12-05 12:10:02.414670736 +0100
+++ logwatch-5.2.2/scripts/logfiles/yum/applyupdate	2005-12-05 09:08:20.000000000 +0100
@@ -0,0 +1,47 @@
+#!/usr/bin/perl -w
+use strict;
+##########################################################################
+# $Id: applydate,v 1.2 2005/05/03 19:33:39 bjorn Exp $
+##########################################################################
+
+use POSIX qw(strftime);
+#use Logwatch ':dates';
+
+my ($SearchDate, $SearchNewDate, $ThisLine);
+
+my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
+
+my $time = time;
+
+#$SearchDate = TimeFilter('%m/%d/%y %H:%M:%S');
+#$SearchNewDate = TimeFilter('%b %d %H:%M:%S');
+
+if ($ENV{'LOGWATCH_DATE_RANGE'} eq 'yesterday') {
+   $SearchDate = strftime("%m/%d/%y", localtime($time-86400));
+   $SearchNewDate = strftime("%b %d", localtime($time-86400));
+}
+elsif ($ENV{'LOGWATCH_DATE_RANGE'} eq 'today') {
+   $SearchDate = strftime("%m/%d/%y", localtime($time));
+   $SearchNewDate = strftime("%b %d", localtime($time));
+}
+elsif ($ENV{'LOGWATCH_DATE_RANGE'} eq 'all') {
+   $SearchDate = '../../..';
+   $SearchNewDate = '... ..';
+}
+
+
+if ( $Debug > 5 ) {
+   print STDERR "DEBUG: Inside ApplyDate (yum)...\n";
+   print STDERR "DEBUG: Looking For: " . $SearchDate . " or " . $SearchNewDate . "\n";
+}
+
+while (defined($ThisLine = <STDIN>)) {
+    # Convert new (yum 2.1) format to old, as yum service script expects that
+    if ($ThisLine =~ s/$SearchNewDate /$SearchDate /o ||
+        $ThisLine =~ m/$SearchDate /o) {
+      print $ThisLine;
+    }
+}
+
+
+
--- logwatch-5.2.2/conf/logfiles/yum.conf.pom	2003-12-15 23:03:52.000000000 +0100
+++ logwatch-5.2.2/conf/logfiles/yum.conf	2005-12-05 12:10:18.848172464 +0100
@@ -1,5 +1,4 @@
 # What actual file?  Defaults to LogPath if not absolute path....
 LogFile = yum.log
 
-*ApplyUSDate
 


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-3/logwatch.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logwatch.spec	23 Nov 2005 13:40:47 -0000	1.16
+++ logwatch.spec	5 Dec 2005 11:51:12 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 5.2.2
-Release: 1.FC3.2
+Release: 1.FC3.3
 Copyright: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -14,6 +14,7 @@
 Patch6: logwatch-2.6-101744-up2date.patch
 Patch7: logwatch-5.2.2-zz_disk_space.patch
 Patch8: logwatch-5.2.2-missing_time.patch
+Patch9: logwatch-5.2.2-yum.patch
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
 BuildArchitectures: noarch
@@ -36,6 +37,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %install
 rm -rf %{buildroot}
@@ -113,6 +115,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Dec  5 2005 Ivana Varekova <varekova at redhat.com> 5.2.2-1.FC3.3
+- fix the second part of 169057 bug - logwatch does not report
+   yum service log
+
 * Wed Nov 16 2005 Ivana Varekova <varekova at redhat.com> 5.2.2-1.FC3.2
 - fix 169057 bug - missing data in cron log messages