packages: mcelog/mcelog.spec, mcelog/bashism.patch (NEW) - avoid bash dep, ...

[glen]

Author: glen                         Date: Tue Aug 10 10:42:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid bash dep, rel 2

---- Files affected:
packages/mcelog:
   mcelog.spec (1.22 -> 1.23) , bashism.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mcelog/mcelog.spec
diff -u packages/mcelog/mcelog.spec:1.22 packages/mcelog/mcelog.spec:1.23
--- packages/mcelog/mcelog.spec:1.22	Tue Aug 10 12:39:45 2010
+++ packages/mcelog/mcelog.spec	Tue Aug 10 12:42:34 2010
@@ -2,7 +2,7 @@
 # TODO
 # - sync pl
 %define		subver	pre3
-%define		rel		1.1
+%define		rel		2
 Summary:	x86-64/x86 Machine Check Exceptions collector and decoder
 Summary(pl.UTF-8):	Narzędzie do zbierania i dekodowania wyjątków MCE na platformie x86-64/x86
 Name:		mcelog
@@ -18,6 +18,7 @@
 Source4:	%{name}.sysconfig
 Patch1:		%{name}-FHS.patch
 Patch2:		manual.patch
+Patch3:		bashism.patch
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -61,6 +62,7 @@
 %setup -q -n %{name}-%{version}%{subver}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} \
@@ -117,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/08/10 10:42:34  glen
+- avoid bash dep, rel 2
+
 Revision 1.22  2010/08/10 10:39:45  glen
 - overwrite triggers on upgrade
 

================================================================
Index: packages/mcelog/bashism.patch
diff -u /dev/null packages/mcelog/bashism.patch:1.1
--- /dev/null	Tue Aug 10 12:42:40 2010
+++ packages/mcelog/bashism.patch	Tue Aug 10 12:42:34 2010
@@ -0,0 +1,17 @@
+--- mcelog-1.0pre3/triggers/cache-error-trigger~	2010-01-21 04:36:52.000000000 +0200
++++ mcelog-1.0pre3/triggers/cache-error-trigger	2010-08-10 13:40:29.531631113 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # cache error trigger. This shell script is executed by mcelog in daemon mode
+ # when a CPU reports excessive corrected cache errors. This could be a indication
+ # for future uncorrected errors.
+@@ -25,7 +25,7 @@
+ 	logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold"
+ 	F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i)
+ 	echo 0 > $F
+-	if [ "$(< $F)" != "0" ] then
++	if [ "$(cat $F)" != "0" ] then
+ 		logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed"
+ 	fi
+ done
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mcelog/mcelog.spec?r1=1.22&r2=1.23&f=u