rpms/logwatch/F-8 logwatch-7.3.6-maillog.patch, 1.1, 1.2 logwatch.spec, 1.85, 1.86

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16389

Modified Files:
	logwatch-7.3.6-maillog.patch logwatch.spec 
Log Message:

 - Resolves: #427596
  fix mailto setting 
--------------------------------------


logwatch-7.3.6-maillog.patch:

Index: logwatch-7.3.6-maillog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch-7.3.6-maillog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.6-maillog.patch	8 Jan 2008 13:09:16 -0000	1.1
+++ logwatch-7.3.6-maillog.patch	20 Feb 2008 15:47:37 -0000	1.2
@@ -1,17 +1,21 @@
 diff -up logwatch-7.3.6/scripts/logwatch.pl.pom logwatch-7.3.6/scripts/logwatch.pl
---- logwatch-7.3.6/scripts/logwatch.pl.pom	2008-01-08 11:04:59.000000000 +0100
-+++ logwatch-7.3.6/scripts/logwatch.pl	2008-01-08 11:23:09.000000000 +0100
-@@ -359,6 +359,13 @@ if ($ShowVersion) {
-    exit 0;
- }
+--- logwatch-7.3.6/scripts/logwatch.pl.pom	2008-02-20 15:31:36.000000000 +0100
++++ logwatch-7.3.6/scripts/logwatch.pl	2008-02-20 15:57:36.000000000 +0100
+@@ -59,9 +59,15 @@ my (@AllShared, @AllLogFiles, @FileList)
+ # These need to not be global variables one day
+ my (@ReadConfigNames, @ReadConfigValues);
  
-+#if MAILTO is set in the environment, grab it as we may be being used by
-+#cron or anacron, which do not set command line args.
-+if ($ENV{'MAILTO'})
-+{
+-# Default config here...
++# Default config here...
+ $Config{'detail'} = 0;
+-$Config{'mailto'} = "root";
++# if MAILTO is set in the environment, grab it, as it may be used by cron
++# or anacron
++if ($ENV{'MAILTO'}) {
 +    $Config{'mailto'} = $ENV{'MAILTO'};
++} else {
++    $Config{'mailto'} = "root";
 +}
-+
- if ($tmp_mailto) {
-    $Config{'mailto'} = $tmp_mailto;
-    $Config{'print'} = 0;
+ $Config{'mailfrom'} = "Logwatch";
+ $Config{'save'} = "";
+ $Config{'print'} = 1;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- logwatch.spec	14 Feb 2008 14:13:49 -0000	1.85
+++ logwatch.spec	20 Feb 2008 15:47:37 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -188,6 +188,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Wed Feb 20 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-15
+- Resolves: #427596
+  fix mailto setting 
+
 * Thu Feb  8 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-14
 - Resolves: #432766
   fix cron script