packages: grub2/grub2.spec, grub2/update-grub (NEW), grub2/update-grub.8 (N...

[glen]

Author: glen                         Date: Wed Nov 11 16:26:01 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add upgrade-grub from debian

---- Files affected:
packages/grub2:
   grub2.spec (1.53 -> 1.54) , update-grub (NONE -> 1.1)  (NEW), update-grub.8 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.53 packages/grub2/grub2.spec:1.54
--- packages/grub2/grub2.spec:1.53	Wed Nov 11 16:38:16 2009
+++ packages/grub2/grub2.spec	Wed Nov 11 17:25:56 2009
@@ -19,6 +19,8 @@
 #Source0:	%{name}-%{snap}.tar.bz2
 Source0:	http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
 # Source0-md5:	66fe18cd9318e3d67a34d7b7a8e7b1f6
+Source1:	update-grub
+Source2:	update-grub.8
 URL:		http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires:	autoconf >= 2.53
 Patch0:		pld-initrd.patch
@@ -110,15 +112,12 @@
 %{__autoheader}
 echo timestamp > stamp-h.in
 %{__autoconf}
-#for rmk in conf/*.rmk; do
-#  ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
-#done
 export CFLAGS="-Os %{?debug:-g}"
 
 # mawk stalls at ./genmoddep.awk, so force gawk
 AWK=gawk \
 %configure \
-%{!?_without_grubemu:--enable-grub-emu}\
+%{!?without_grubemu:--enable-grub-emu} \
 	BUILD_CFLAGS="$CFLAGS"
 %{__make} -j1 \
 	BUILD_CFLAGS="$CFLAGS" \
@@ -141,6 +140,8 @@
 	pkgdatadir="%{_datadir}"
 
 cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_datadir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/update-grub
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/update-grub.8
 rm $RPM_BUILD_ROOT%{_infodir}/dir
 
 %clean
@@ -162,6 +163,7 @@
 %attr(755,root,root) %{_sbindir}/grub-editenv
 %attr(755,root,root) %{_sbindir}/grub-mkconfig
 %attr(755,root,root) %{_sbindir}/grub-mkelfimage
+%attr(755,root,root) %{_sbindir}/update-grub
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/grub-mkimage
 %{_mandir}/man1/grub-mkimage.1*
@@ -177,6 +179,7 @@
 %{_mandir}/man1/grub-editenv.1*
 %{_mandir}/man8/grub-mkconfig.8*
 %{_mandir}/man1/grub-mkelfimage.1*
+%{_mandir}/man8/update-grub.8*
 %if %{with grubemu}
 %attr(755,root,root) %{_sbindir}/grub-emu
 %{_mandir}/man8/grub-emu.8*
@@ -212,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2009/11/11 16:25:56  glen
+- add upgrade-grub from debian
+
 Revision 1.53  2009/11/11 15:38:16  glen
 - find pld initrd images with grub-install; rel 2
 

================================================================
Index: packages/grub2/update-grub
diff -u /dev/null packages/grub2/update-grub:1.1
--- /dev/null	Wed Nov 11 17:26:01 2009
+++ packages/grub2/update-grub	Wed Nov 11 17:25:56 2009
@@ -0,0 +1,2 @@
+#!/bin/sh -e
+exec grub-mkconfig -o /boot/grub/grub.cfg "$@"

================================================================
Index: packages/grub2/update-grub.8
diff -u /dev/null packages/grub2/update-grub.8:1.1
--- /dev/null	Wed Nov 11 17:26:01 2009
+++ packages/grub2/update-grub.8	Wed Nov 11 17:25:56 2009
@@ -0,0 +1,14 @@
+.\" Copyright 2009 Felix Zielcke
+.\" Lincensed under GPL3+
+.TH UPDATE-GRUB "8" "April 2009"
+.SH NAME
+update-grub \- stub for grub-mkconfig
+.SH SYNOPSIS
+.B update-grub
+.SH DESCRIPTION
+.B update-grub
+is a stub for running
+.B grub-mkconfig -o /boot/grub/grub.cfg
+to generate a grub2 config file.
+.SH "SEE ALSO"
+.BR grub-mkconfig (8)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.53&r2=1.54&f=u