[grub2/f17: 67/71] Merge branch 'master' into f17

[Peter Jones]

commit b9e754517d41b5caa16d5f5763a130c236d127b7
Merge: d9c0e66 f3c723c
Author: Peter Jones <pjones at redhat.com>
Date:   Fri May 25 15:08:10 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	grub-1.99-just-say-linux.patch
    	grub2.spec
    	sources

 grub-1.99-gcc-4.7.0.patch                     |   29 ----
 grub-1.99-just-say-linux.patch                |    8 +-
 grub-2.00-Add-check_completed_boot.patch      |  161 ++++++++++++++++++
 grub-2.00-Add-fwsetup.patch                   |  218 +++++++++++++++++++++++++
 grub-2.00-Dont-set-boot-on-ppc.patch          |   43 +++++
 grub-2.00-Fix-module-trampoline-for-ppc.patch |  120 ++++++++++++++
 grub-2.00-add-fw_path-search.patch            |   78 +++++++++
 grub-2.00-ppc-no-tree-scanning.patch          |   59 +++++++
 grub2.spec                                    |  194 +++++++++++++----------
 sources                                       |    2 +-
 10 files changed, 794 insertions(+), 118 deletions(-)
---
diff --cc grub2.spec
index 6a4643b,5098012..aae37af
--- a/grub2.spec
+++ b/grub2.spec
@@@ -56,8 -77,9 +77,10 @@@ BuildRequires:  /usr/lib/crt1.o glibc-s
  BuildRequires:  autoconf automake autogen device-mapper-devel
  BuildRequires:	freetype-devel gettext-devel git
  BuildRequires:	texinfo
+ BuildRequires:	dejavu-sans-fonts
  
 +Requires:	gettext os-prober which file system-logos
+ Requires:	%{name}-tools = %{epoch}:%{version}-%{release}
  Requires(pre):  dracut
  Requires(post): dracut
  
@@@ -286,14 -319,30 +320,30 @@@ rm -r /boot/grub2.tmp/ || 
  
  %preun
  if [ "$1" = 0 ]; then
- 	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/grub2.info.gz || :
- 	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/grub2-dev.info.gz || :
+ 	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz || :
+ 	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz || :
  fi
  
 -%files
 +%files -f grub.lang
  %defattr(-,root,root,-)
- /etc/bash_completion.d/grub
  %{_libdir}/grub/*-%{platform}/
+ %config(noreplace) %{_sysconfdir}/%{name}.cfg
+ %ghost %config(noreplace) /boot/%{name}/grub.cfg
+ %doc grub-%{tarversion}/COPYING
+ 
+ %ifarch %{efi}
+ %files efi
+ %defattr(-,root,root,-)
+ %{_libdir}/grub/%{grubefiarch}
+ %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg
+ %attr(0755,root,root)/boot/efi/EFI/%{efidir}
+ %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg
+ %doc grub-%{tarversion}/COPYING
+ %endif
+ 
+ %files tools -f grub.lang
+ %defattr(-,root,root,-)
+ %dir %{_libdir}/grub/
  %{_datarootdir}/grub/
  %{_sbindir}/%{name}-mkconfig
  %{_sbindir}/%{name}-mknetdir