SPECS: grub2.spec - resolved conflict

[qboosh]

Author: qboosh                       Date: Wed Feb 14 21:42:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict

---- Files affected:
SPECS:
   grub2.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/grub2.spec
diff -u SPECS/grub2.spec:1.37 SPECS/grub2.spec:1.38
--- SPECS/grub2.spec:1.37	Tue Feb 13 08:16:47 2007
+++ SPECS/grub2.spec	Wed Feb 14 22:42:50 2007
@@ -10,22 +10,12 @@
 Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
-<<<<<<< grub2.spec
-Version:	1.94
-Release:	0.1
-=======
 Version:	1.95
 Release:	0.2
->>>>>>> 1.35
 License:	GPL v2
 Group:		Base
-<<<<<<< grub2.spec
-Source0:	ftp://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
-# Source0-md5:	cd6aa192364442e4afe25327ea98bc47
-=======
 Source0:	ftp://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
 # Source0-md5:	4ea234d8fc5d551f61bc65e553e51399
->>>>>>> 1.35
 URL:		http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -103,18 +93,6 @@
 avançados e que querem mais recursos de seu boot loader.
 
 %prep
-<<<<<<< grub2.spec
-%setup -q -n grub-%{version}
-sed 's_/boot/grub_%{_datadir}_' \
-	-i util/grub-emu.c	\
-	-i util/i386/pc/grub-setup.c	\
-	-i kern/i386/pc/startup.S	\
-	-i util/i386/pc/grub-mkdevicemap.c	\
-	-i util/i386/pc/grub-probefs.c	\
-	-i util/i386/pc/grub-install.in	\
-	-i util/powerpc/ieee1275/grub-install.in
-chmod +x mkinstalldirs
-=======
 %setup -q -n grub-%{version}
 sed -i -e 's#AC_INIT(GRUB,#AC_INIT(GRUB2,#g' configure.ac
 sed -i -e 's,/boot/grub,%{_datadir},' \
@@ -126,7 +104,6 @@
 	util/i386/pc/grub-probe.c \
 	util/i386/pc/grub-setup.c \
 	util/powerpc/ieee1275/grub-install.in
->>>>>>> 1.35
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -193,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2007/02/14 21:42:50  qboosh
+- resolved conflict
+
 Revision 1.37  2007/02/13 07:16:47  glen
 - tabs in preamble
 
================================================================

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