From a37bbabf64a334a433aaa9141b2aae7589985b3e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Jun 28 2012 19:02:12 +0000
Subject: Rebase to grub-2.00 release.


---

diff --git a/grub-2.00-Dont-set-boot-on-ppc.patch b/grub-2.00-Dont-set-boot-on-ppc.patch
index c2051f4..481d8b9 100644
--- a/grub-2.00-Dont-set-boot-on-ppc.patch
+++ b/grub-2.00-Dont-set-boot-on-ppc.patch
@@ -10,10 +10,10 @@ there is no way to set boot-device.
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/util/grub-install.in b/util/grub-install.in
-index 293b756..2503aa0 100644
+index e19f1cd..69a97ad 100644
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
-@@ -818,14 +818,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
+@@ -807,14 +807,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
  	    }
  	fi
  
@@ -37,7 +37,4 @@ index 293b756..2503aa0 100644
 +	fi
      fi
  elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then
-     dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub
--- 
-1.7.10.1
-
+     dvhtool -d "${install_device}" --unix-to-vh "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub
diff --git a/grub2.spec b/grub2.spec
index 21d5516..c85ee29 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -381,6 +381,9 @@ fi
 %doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
 
 %changelog
+* Thu Jun 28 2012 Peter Jones <pjones@redhat.com> - 2.00-1
+- Rebase to grub-2.00 release.
+
 * Mon Jun 18 2012 Peter Jones <pjones@redhat.com> - 2.0-0.37.beta6
 - Fix double-free in grub-probe.