SPECS: bootchart.spec - R: for -logger - ignore errors from grubby...

[glen]

Author: glen                         Date: Tue Dec  5 21:34:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: for -logger
- ignore errors from grubby
- add -bash.patch

---- Files affected:
SPECS:
   bootchart.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/bootchart.spec
diff -u SPECS/bootchart.spec:1.4 SPECS/bootchart.spec:1.5
--- SPECS/bootchart.spec:1.4	Tue Dec  5 22:23:19 2006
+++ SPECS/bootchart.spec	Tue Dec  5 22:34:33 2006
@@ -3,12 +3,13 @@
 Summary(pl):	Wizualizacja wydajności procesu startu systemu
 Name:		bootchart
 Version:	0.9
-Release:	1
+Release:	1.2
 Epoch:		0
 License:	GPL
 Group:		Base
 Source0:	http://dl.sourceforge.net/bootchart/%{name}-%{version}.tar.bz2
 # Source0-md5:	4be91177d19069e21beeb106f2f77dff
+Patch0:		%{name}-bash.patch
 URL:		http://www.bootchart.org/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-cli >= 0:1.0
@@ -49,6 +50,11 @@
 Summary:	Boot logging script for %{name}
 Summary(pl):	Skrypt logujący proces startu dla bootcharta
 Group:		Base
+Requires:	coreutils
+Requires:	grep
+Requires:	mktemp
+Requires:	mount
+Requires:	sed
 
 %description logger
 Boot logging script for %{name}.
@@ -58,6 +64,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Remove the bundled commons-cli
@@ -105,13 +112,13 @@
 	initrd=$(/sbin/grubby --info=$kernel | sed -n '/^initrd=/{s/^initrd=//;p;q;}')
 	[ ! -z $initrd ] && initrd="--initrd=$initrd"
 	/sbin/grubby --remove-kernel TITLE=%{boottitle}
-	/sbin/grubby --copy-default --add-kernel=$kernel $initrd --args="init=/sbin/bootchartd" --title=%{boottitle}
+	/sbin/grubby --copy-default --add-kernel=$kernel $initrd --args="init=/sbin/bootchartd" --title=%{boottitle} || :
 fi
 
 %preun logger
 # Remove the grub/lilo entry
 if [ -x /sbin/grubby ]; then
-	/sbin/grubby --remove-kernel TITLE=%{boottitle}
+	/sbin/grubby --remove-kernel TITLE=%{boottitle} || :
 fi
 
 %files
@@ -137,6 +144,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/12/05 21:34:33  glen
+- R: for -logger
+- ignore errors from grubby
+- add -bash.patch
+
 Revision 1.4  2006/12/05 21:23:19  glen
 - actually builds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bootchart.spec?r1=1.4&r2=1.5&f=u