From 54192aaaf3085ea6627313e43dec9fbb98b61e35 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Jul 02 2013 18:29:51 +0000
Subject: pull in the extra fix done in f19


Merge branch 'f19'

Conflicts:
	grub2.spec

---

diff --git a/0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
new file mode 100644
index 0000000..096b32a
--- /dev/null
+++ b/0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@@ -0,0 +1,27 @@
+From 8c62c84f2b85bebf0a3f5fe588aa19e9d113996a Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 21 Jun 2013 14:44:08 -0400
+Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so
+ linewrapping works (#976643).
+
+Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
+---
+ grub-core/normal/menu_text.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
+index 851ed13..95b90ea 100644
+--- a/grub-core/normal/menu_text.c
++++ b/grub-core/normal/menu_text.c
+@@ -286,7 +286,7 @@ grub_menu_init_page (int nested, int edit,
+ 
+   geo->border = 0;
+   geo->first_entry_x = 0; /* no margin */
+-  geo->entry_width = grub_term_width (term) - 1;
++  geo->entry_width = grub_term_width (term) - 2;
+ 
+   geo->first_entry_y = 3; /* three empty lines*/
+ 
+-- 
+1.8.2.1
+
diff --git a/grub2.spec b/grub2.spec
index 33713f1..782b353 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -41,7 +41,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.00
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -537,6 +537,7 @@ Patch0480: 0480-Disable-GRUB-video-support-for-IBM-power-machines.patch
 Patch0481: 0481-Revert-Add-bootpath-device-to-the-list-967862.patch
 Patch0482: 0482-Fix-net_bootp-cmd-crash-when-there-isn-t-network-car.patch
 Patch0483: 0483-Initialize-grub_file_filters_-all-enabled.patch
+Patch0484: 0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
 
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel
@@ -922,9 +923,14 @@ fi
 %{_datarootdir}/grub/themes/
 
 %changelog
-* Tue Jul 02 2013 Dennis Gilmore <dennis@ausil.us> - 2.00-22
+
+* Tue Jul 02 2013 Dennis Gilmore <dennis@ausil.us> - 2.00-23
 - add epoch to obsoletes
 
+* Fri Jun 21 2013 Peter Jones <pjones@redhat.com> - 2.00-22
+- Fix linewrapping in edit menu.
+  Resolves: rhbz #976643
+
 * Thu Jun 20 2013 Peter Jones <pjones@redhat.com> - 2.00-21
 - Fix obsoletes to pull in -starfield-theme subpackage when it should.