packages: grub2/grub2.spec, grub2/pld-initrd.patch (NEW) - find pld initrd ...

[glen]

Author: glen                         Date: Wed Nov 11 15:38:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- find pld initrd images with grub-install; rel 2

---- Files affected:
packages/grub2:
   grub2.spec (1.52 -> 1.53) , pld-initrd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.52 packages/grub2/grub2.spec:1.53
--- packages/grub2/grub2.spec:1.52	Wed Nov 11 15:55:57 2009
+++ packages/grub2/grub2.spec	Wed Nov 11 16:38:16 2009
@@ -12,7 +12,7 @@
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
 Version:	1.97.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 # svn export svn://svn.sv.gnu.org/grub/trunk/grub2
@@ -21,6 +21,7 @@
 # Source0-md5:	66fe18cd9318e3d67a34d7b7a8e7b1f6
 URL:		http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires:	autoconf >= 2.53
+Patch0:		pld-initrd.patch
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gawk
@@ -100,6 +101,7 @@
 
 %prep
 %setup -q -n grub-%{version}
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -144,10 +146,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/postshell
+%post -p %{_sbindir}/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun	-p /sbin/postshell
+%postun -p %{_sbindir}/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
@@ -210,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2009/11/11 15:38:16  glen
+- find pld initrd images with grub-install; rel 2
+
 Revision 1.52  2009/11/11 14:55:57  glen
 - check-files shutup, no extra /bin/sh dep
 

================================================================
Index: packages/grub2/pld-initrd.patch
diff -u /dev/null packages/grub2/pld-initrd.patch:1.1
--- /dev/null	Wed Nov 11 16:38:21 2009
+++ packages/grub2/pld-initrd.patch	Wed Nov 11 16:38:16 2009
@@ -0,0 +1,11 @@
+--- grub-1.97.1/util/grub.d/10_linux.in~	2009-11-09 17:48:16.000000000 +0200
++++ grub-1.97.1/util/grub.d/10_linux.in	2009-11-11 17:36:26.000000000 +0200
+@@ -77,7 +77,7 @@
+ 
+   initrd=
+   for i in "initrd.img-${version}" "initrd-${version}.img" \
+-	   "initrd-${version}" "initrd.img-${alt_version}" \
++	   "initrd-${version}" "initrd.img-${alt_version}" "initrd-${version}.gz" \
+ 	   "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+     if test -e "${dirname}/${i}" ; then
+       initrd="$i"
================================================================

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