rpms/logwatch/devel logwatch-7.3.1-automount.patch, NONE, 1.1 logwatch-7.3.1-yum.patch, NONE, 1.1 logwatch.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-automount.patch logwatch-7.3.1-yum.patch 
Log Message:
- fix #204078 - missing /etc/logwatch/scripts/services
- add yum service patch
- fix #209554 - automount service problem


logwatch-7.3.1-automount.patch:
 automount |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-automount.patch ---
--- logwatch-7.3.1/scripts/services/automount.pom	2005-12-24 05:05:50.000000000 +0100
+++ logwatch-7.3.1/scripts/services/automount	2006-10-20 15:19:09.000000000 +0200
@@ -18,7 +18,8 @@
    if ( ($ThisLine =~ /^using kernel protocol version .*$/) or
          ($ThisLine =~ /^expired .*$/) or
          ($ThisLine =~ /^lookup\(ldap\): got answer, but no first entry for /) or
-         ($ThisLine =~ /^>>.*mount: .*$/) ) {
+         ($ThisLine =~ /^>>.*mount: .*$/) or
+         ($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locat nis\+ table auto.master/) ) {
       # don't care about these
    }
    elsif ( ($ThisMount) = ($ThisLine =~ /^attempting to mount entry (.*)$/) ) {

logwatch-7.3.1-yum.patch:
 yum |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE logwatch-7.3.1-yum.patch ---
--- logwatch-7.3.1/scripts/services/yum.pom	2005-12-01 05:16:27.000000000 +0100
+++ logwatch-7.3.1/scripts/services/yum	2006-10-20 14:11:24.000000000 +0200
@@ -21,13 +21,13 @@
 
    $ThisLine =~ s/^[^ ]* [^ ]* //;
 
-   if ( $ThisLine =~ s/^Updated: ([^ ]+)/$1/ ) {
+   if ( $ThisLine =~ s/^(?:\(yumex\) )?Updated: ([^ ]+)/$1/ ) {
       $PackageUpdated{$ThisLine}++;
-   } elsif ( $ThisLine =~ s/^Installed: ([^ ]+)/$1/ ) {
+   } elsif ( $ThisLine =~ s/^(?:\(yumex\) )?Installed: ([^ ]+)/$1/ ) {
       $PackageInstalled{$ThisLine}++;
-   } elsif ( $ThisLine =~ s/^Dep Installed: ([^ ]+)/$1/ ) {
+   } elsif ( $ThisLine =~ s/^(?:\(yumex\) )?Dep Installed: ([^ ]+)/$1/ ) {
       $PackageDepInstalled{$ThisLine}++;
-   } elsif ( $ThisLine =~ s/^Erased: ([^ ]+)/$1/ ) {
+   } elsif ( $ThisLine =~ s/^(?:\(yumex\) )?Erased: ([^ ]+)/$1/ ) {
       $PackageErased{$ThisLine}++;
    } else {
       # Report any unmatched entries...


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- logwatch.spec	20 Oct 2006 08:22:06 -0000	1.44
+++ logwatch.spec	20 Oct 2006 13:30:12 -0000	1.45
@@ -1,13 +1,15 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3.1
-Release: 1
+Release: 2%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
 Patch2: logwatch-7.2.1-nosegfault.patch
 Patch8: logwatch-7.3-sshd.patch
+Patch9: logwatch-7.3.1-yum.patch
+Patch10: logwatch-7.3.1-automount.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -23,6 +25,8 @@
 %setup -q
 %patch2 -p1
 %patch8 -p1
+%patch9 -p1 
+%patch10 -p1
 
 %install
 
@@ -74,6 +78,8 @@
 install -m 0755 -d %{buildroot}%{_sbindir}
 ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch
 
+install -m 0755 -d  %{buildroot}%{_sysconfdir}/logwatch/scripts/services
+
 echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
 echo "# Local configuration options go here (defaults are in %{_datadir}/logwatch/default.conf/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
 echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
@@ -93,6 +99,7 @@
 %dir %{_sysconfdir}/logwatch/scripts
 %dir %{_sysconfdir}/logwatch/conf/logfiles
 %dir %{_sysconfdir}/logwatch/conf/services
+%dir %{_sysconfdir}/logwatch/scripts/services
 %dir %{_datadir}/logwatch
 %dir %{_datadir}/logwatch/default.conf
 %dir %{_datadir}/logwatch/default.conf/services
@@ -124,7 +131,12 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
-* Fri Oct 20 2006 Ivana Varekova <varekova#redhat.com> 7.3.1-1
+* Fri Oct 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-2
+- fix #204078 - missing /etc/logwatch/scripts/services
+- add yum service patch
+- fix #209554 - automount service problem 
+
+* Fri Oct 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-1
 - update to 7.3.1
 
 * Tue Aug 29 2006 Ivana Varekova <varekova at redhat.com> 7.3-5