rpms/dmraid/devel move_pattern_file_to_var.patch, NONE, 1.1 dmraid.spec, 1.114, 1.115

[Heinz Mauelshagen]

Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3532

Modified Files:
	dmraid.spec 
Added Files:
	move_pattern_file_to_var.patch 
Log Message:
Switch to using /var/cache/logwatch/dmeventd/syslogpattern.txt

move_pattern_file_to_var.patch:
 dmeventd |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE move_pattern_file_to_var.patch ---
diff --git a/logwatch/dmeventd.var_cache_logwatch b/logwatch/dmeventd
index 9b01676..9bc262d 100644
--- a/logwatch/dmeventd.var_cache_logwatch
+++ b/logwatch/dmeventd
@@ -36,8 +36,7 @@
 # Set the location of the folder to store last time stamp
 # (This is used to record the last log sent out so repeats 
 #  are not mailed in error.)
-$syslogpattern_file =
-        "/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt";
+$syslogpattern_file = "/var/cache/logwatch/dmeventd/syslogpattern.txt";
 
 if (-e $syslogpattern_file) {
 	open(FD, "+<", $syslogpattern_file) or die $!;        


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- dmraid.spec	7 Dec 2009 16:23:48 -0000	1.114
+++ dmraid.spec	12 Jan 2010 15:20:45 -0000	1.115
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -29,6 +29,7 @@ Patch2: pdc_raid10_failure.patch
 Patch3: return_error_wo_disks.patch
 Patch4: fix_sil_jbod.patch
 Patch5: avoid_register.patch
+Patch6: move_pattern_file_to_var.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -74,6 +75,7 @@ Device failure reporting has to be activ
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %define _libdir /%{_lib}
@@ -83,7 +85,7 @@ make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
+install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/,/var/cache/logwatch/dmeventd}
 make DESTDIR=$RPM_BUILD_ROOT install
 ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
 
@@ -105,7 +107,7 @@ install -m 755 lib/libdmraid-events-isw.
 install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
 install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
 install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT/etc/cron.d/dmeventd-logwatch
-install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
+install -m 0700 /dev/null $RPM_BUILD_ROOT/var/cache/logwatch/dmeventd/syslogpattern.txt
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
 
@@ -142,9 +144,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %config(noreplace) /etc/logwatch/*
 %config(noreplace) /etc/cron.d/dmeventd-logwatch
-%ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
+%dir /var/cache/logwatch/dmeventd
+%ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
 
 %changelog
+* Tue Jan 12 2010  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-8
+: Switch to using /var/cache/logwatch/dmeventd/syslogpattern.txt;
+  explicitly claim logwatch files in dmraid-events-logwatch
+
 * Fri Dec 1 2009  Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16-7
 - bz542898: fix Silicon Image JBOD support