rpms/grub/devel grub.spec,1.103,1.104

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4208

Modified Files:
	grub.spec 
Log Message:
* Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 0.97-57
- Fix building with new rpm (with auto buildroot cleaning)
- Update Exclusive arch for F-12 i586 -> i686 change



Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- grub.spec	27 Jul 2009 14:26:40 -0000	1.103
+++ grub.spec	27 Jul 2009 15:39:35 -0000	1.104
@@ -1,11 +1,11 @@
 Name: grub
 Version: 0.97
-Release: 56%{?dist}
+Release: 57%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
 
-ExclusiveArch: i586 x86_64 ia64
+ExclusiveArch: i686 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
 BuildRequires: autoconf /usr/lib/crt1.o automake
 BuildRequires: gnu-efi >= 3.0e-7
@@ -88,11 +88,7 @@ fi
 export CFLAGS
 %configure --sbindir=/sbin --disable-auto-linux-mem-opt --datarootdir=%{_datadir} --with-platform=efi
 make
-rm -fr $RPM_BUILD_ROOT
-%makeinstall sbindir=${RPM_BUILD_ROOT}/sbin
-# is there a better way to do this?
-mkdir -m 0755 -p ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/ 
-mv ${RPM_BUILD_ROOT}/%{_datadir}/grub/*/grub.efi ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/grub.efi
+mv efi/grub.efi .
 make clean
 autoreconf
 autoconf
@@ -102,8 +98,11 @@ export CFLAGS
 make
 
 %install
+rm -fr $RPM_BUILD_ROOT
 %makeinstall sbindir=${RPM_BUILD_ROOT}/sbin
 mkdir -p ${RPM_BUILD_ROOT}/boot/grub
+mkdir -m 0755 -p ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/
+install -m 755 grub.efi ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/grub.efi
 
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
@@ -138,6 +137,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 0.97-57
+- Fix building with new rpm (with auto buildroot cleaning)
+- Update Exclusive arch for F-12 i586 -> i686 change
+
 * Mon Jul 27 2009 Hans de Goede <hdegoede at redhat.com> - 0.97-56
 - Actually apply support for partitionable md devices patch (#503698)