SPECS: grub2.spec - up to 20060314, builds on ppc

[sparky]

Author: sparky                       Date: Thu Mar 16 20:06:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 20060314, builds on ppc

---- Files affected:
SPECS:
   grub2.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/grub2.spec
diff -u SPECS/grub2.spec:1.26 SPECS/grub2.spec:1.27
--- SPECS/grub2.spec:1.26	Mon Jan 16 20:38:53 2006
+++ SPECS/grub2.spec	Thu Mar 16 21:06:24 2006
@@ -5,7 +5,7 @@
 # Conditional build:
 %bcond_with	static	# build static binaries
 #
-%define		_snap	20060103
+%define		_snap	20060314
 Summary:	GRand Unified Bootloader
 Summary(pl):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR):	Gerenciador de inicializaçăo GRUB2
@@ -16,7 +16,7 @@
 License:	GPL v2
 Group:		Base
 Source0:	http://sparky.homelinux.org/snaps/grub/%{name}-%{_snap}.tar.bz2
-# Source0-md5:	4880185c75388fd0c09596a712a95cdc
+# Source0-md5:	46f0b2708abaf70826f5761a68a0ee09
 URL:		http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -42,6 +42,7 @@
 %define		_sbindir	/sbin
 %define		_bindir		%{_sbindir}
 %define		_libdir		/boot
+%define		_datadir	%{_libdir}/%{name}
 
 %description
 GRUB is a GPLed bootloader intended to unify bootloading across x86
@@ -89,17 +90,11 @@
 
 %prep
 %setup -q -n %{name}
-
-sed 's_grubof_%{_libdir}/%{name}/grubof_' \
-	-i util/powerpc/ieee1275/grub-mkimage.c
-sed '/i\[\[3456\]\]86)/a  x86_64) host_cpu=i386 ;;' \
-	-i configure.ac
-sed 's_"/boot/grub"_"%{_libdir}/%{name}"_' \
+sed 's_"/boot/grub"_"%{_datadir}"_' \
 	-i util/grub-emu.c \
 	-i util/i386/pc/grub-setup.c \
-	-i kern/i386/pc/startup.S
-sed 's/setjmp\.c/setjmp.S/g' \
-	-i conf/sparc64-ieee1275.mk
+	-i kern/i386/pc/startup.S \
+	-i util/i386/pc/grub-install.in
 chmod +x mkinstalldirs
 
 %build
@@ -156,7 +151,7 @@
 %{_libdir}/%{name}
 %attr(754,root,root) %{_sbindir}/grub-emu
 %attr(754,root,root) %{_sbindir}/grub-mkimage
-%attr(754,root,root) %{_sbindir}/%{name}-install
+%attr(754,root,root) %{_sbindir}/grub-install
 %ifarch %{ix86} %{x8664}
 %attr(754,root,root) %{_sbindir}/grub-mkdevicemap
 %attr(754,root,root) %{_sbindir}/grub-probefs
@@ -169,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/03/16 20:06:24  sparky
+- up to 20060314, builds on ppc
+
 Revision 1.26  2006/01/16 19:38:53  sparky
 - package grub-instal on ppc, build on it
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/grub2.spec?r1=1.26&r2=1.27&f=u