rpms/logwatch/F-7 logwatch-7.3.4-mailto.patch, 1.1, 1.2 logwatch.spec, 1.70, 1.71

[Ivana Varekova (varekova)]

Author: varekova

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

Modified Files:
	logwatch-7.3.4-mailto.patch logwatch.spec 
Log Message:
- Resolves: #427596
  fix mailto patch


logwatch-7.3.4-mailto.patch:

Index: logwatch-7.3.4-mailto.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-7/logwatch-7.3.4-mailto.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.4-mailto.patch	20 Apr 2007 10:21:45 -0000	1.1
+++ logwatch-7.3.4-mailto.patch	9 Jan 2008 11:11:41 -0000	1.2
@@ -1,15 +1,24 @@
---- logwatch-7.3.4/scripts/logwatch.pl.pom	2007-04-13 15:43:35.000000000 +0200
-+++ logwatch-7.3.4/scripts/logwatch.pl	2007-04-20 12:14:43.000000000 +0200
-@@ -312,6 +312,13 @@
+diff -up logwatch-7.3.4/scripts/logwatch.pl.pom logwatch-7.3.4/scripts/logwatch.pl
+--- logwatch-7.3.4/scripts/logwatch.pl.pom	2008-01-08 14:51:38.000000000 +0100
++++ logwatch-7.3.4/scripts/logwatch.pl	2008-01-08 14:53:10.000000000 +0100
+@@ -79,6 +79,13 @@ $Config{'output'} = "unformatted";
+ $Config{'encode'} = 0;
+ $Config{'html_wrap'} = 80;
+ 
++#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'})
++{
++  $Config{'mailto'} = $ENV{'MAILTO'};
++}
++
+ if (-e "$ConfigDir/conf/html/header.html") {
+    $Config{'html_header'} = "$ConfigDir/conf/html/header.html";
+ } elsif (-e "$BaseDir/dist.conf/html/header.html") {
+@@ -312,6 +319,7 @@ for (my $i = 0; $i <= $#ReadConfigNames;
  
  CleanVars();
  
-+#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'})
-+  {
-+    $Config{'mailto'} = $ENV{'MAILTO'};
-+  }
 +
  if ($OldMailTo ne $Config{'mailto'}) {
     $Config{'print'} = 0;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-7/logwatch.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- logwatch.spec	22 Nov 2007 12:20:02 -0000	1.70
+++ logwatch.spec	9 Jan 2008 11:11:41 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -151,6 +151,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Tue Jan  8 2008 Ivana Varekova <varekova at redhat.com> 7.3.4-10
+- Resolves: #427596
+  fix mailto patch
+
 * Thu Nov 22 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-9
 - fix pam_unix script output (#389311)