[grub2: 6/8] update to grub 2.0 rc1

[Peter Jones]

commit 3734d8af18aac0acdc1a6c7de2e96ef0a8b11b5e
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Mon Jun 25 15:24:45 2012 +0200

    update to grub 2.0 rc1
    
    - drop backports of changes already included in 2.0rc1
    - update grub-2.00-Add-fwsetup.patch

 grub-2.00-Add-fwsetup.patch                  |   38 +++---
 grub-2.00-ieee1276.patch                     |   16 ---
 grub-2.00-ignore-gnulib-gets-stupidity.patch |   26 ----
 grub-2.00-linux-mbr.patch                    |   82 -------------
 grub-2.00-no-canon.patch                     |   29 -----
 grub-2.00-no-double-free.patch               |   17 ---
 grub-2.00-no-huge-video.patch                |   67 -----------
 grub-2.00-ppc-hints.patch                    |  157 -------------------------
 grub-2.00-ppc-usb-quiesce.patch              |   89 --------------
 grub-2.00-support-vscsi-on-ibm-ppc.patch     |  162 --------------------------
 grub2.spec                                   |   13 +--
 11 files changed, 21 insertions(+), 675 deletions(-)
---
diff --git a/grub-2.00-Add-fwsetup.patch b/grub-2.00-Add-fwsetup.patch
index 051a9e1..5abae3b 100644
--- a/grub-2.00-Add-fwsetup.patch
+++ b/grub-2.00-Add-fwsetup.patch
@@ -16,22 +16,22 @@ specific value and reboot.
  6 files changed, 139 insertions(+)
  create mode 100644 grub-core/commands/efi/efifwsetup.c
 
-diff --git a/ChangeLog b/ChangeLog
-index ce52576..29ebcbd 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,11 @@
-+2012-05-24  Peter Jones <pjones at redhat.com>
-+
-+	* grub-core/Makefile.core.def: add efifwsetup module
-+	* grub-core/commands/efi/efifwsetup.c: add code for fwsetup command
-+	* grub-core/kern/efi/efi.c (grub_efi_set_variable): New function
-+	* include/grub/efi/api.h: add define for OsIndications variable
-+	* include/grub/efi/efi.h: export grub_efi_set_variable
-+
- 2012-05-31  Vladimir Serbinenko  <phcoder at gmail.com>
- 
- 	* configure.ac: Bump to beta6.
+#diff --git a/ChangeLog b/ChangeLog
+#index ce52576..29ebcbd 100644
+#--- a/ChangeLog
+#+++ b/ChangeLog
+#@@ -1,3 +1,11 @@
+#+2012-05-24  Peter Jones <pjones at redhat.com>
+#+
+#+	* grub-core/Makefile.core.def: add efifwsetup module
+#+	* grub-core/commands/efi/efifwsetup.c: add code for fwsetup command
+#+	* grub-core/kern/efi/efi.c (grub_efi_set_variable): New function
+#+	* include/grub/efi/api.h: add define for OsIndications variable
+#+	* include/grub/efi/efi.h: export grub_efi_set_variable
+#+
+# 2012-05-31  Vladimir Serbinenko  <phcoder at gmail.com>
+# 
+# 	* configure.ac: Bump to beta6.
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
 index 000cf0d..d0c06d5 100644
 --- a/grub-core/Makefile.core.def
@@ -181,9 +181,9 @@ index 6f12c76..7a418a6 100644
 +  return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var);
 +}
 +
- grub_uint64_t
- grub_rtc_get_time_ms (void)
- {
+ #pragma GCC diagnostic ignored "-Wcast-align"
+ 
+ /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
 index 26127de..a47a4e3 100644
 --- a/include/grub/efi/api.h
diff --git a/grub2.spec b/grub2.spec
index b6f195d..7b52b18 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -33,13 +33,13 @@
 
 %endif
 
-%global tarversion 2.00~beta6
+%global tarversion 2.00~rc1
 %undefine _missing_build_ids_terminate_build
 
 Name:           grub2
 Epoch:          1
 Version:        2.0
-Release:        0.37.beta6%{?dist}
+Release:        0.37.rc1%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -50,20 +50,11 @@ Source0:        ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
 Source3:        README.Fedora
 Source4:	http://unifoundry.com/unifont-5.1.20080820.pcf.gz
 Source5:	theme.tar.bz2
-Patch0:		grub-2.00-ieee1276.patch
-Patch1:		grub-2.00-no-canon.patch
 Patch2:		grub-1.99-just-say-linux.patch
 Patch5:		grub-1.99-ppc-terminfo.patch
 Patch10:	grub-2.00-add-fw_path-search.patch
 Patch11:	grub-2.00-Add-fwsetup.patch
 Patch13:	grub-2.00-Dont-set-boot-on-ppc.patch
-Patch14:	grub-2.00-ignore-gnulib-gets-stupidity.patch
-Patch15:	grub-2.00-linux-mbr.patch
-Patch16:	grub-2.00-no-huge-video.patch
-Patch17:	grub-2.00-ppc-hints.patch
-Patch18:	grub-2.00-support-vscsi-on-ibm-ppc.patch
-Patch19:	grub-2.00-ppc-usb-quiesce.patch
-Patch20:	grub-2.00-no-double-free.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)