From 38f72d25e9e1431334a5d9b1d23e04ac75622217 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:46:49 -0400 Subject: [PATCH 1/3] Fix linewrapping in edit menu. Resolves: rhbz #976643 --- ...-1-for-our-right-hand-margin-so-line.patch | 27 +++++++++++++++++++ grub2.spec | 5 ++++ 2 files changed, 32 insertions(+) create mode 100644 0484-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch 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 +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 +--- + 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 aada8a0..a71366d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -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,6 +923,10 @@ fi %{_datarootdir}/grub/themes/ %changelog +* Fri Jun 21 2013 Peter Jones - 2.00-21 +- Fix linewrapping in edit menu. + Resolves: rhbz #976643 + * Thu Jun 20 2013 Peter Jones - 2.00-21 - Fix obsoletes to pull in -starfield-theme subpackage when it should. From 9546739573a76b916aebeb739cda061535f1027b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:47:42 -0400 Subject: [PATCH 2/3] Fix linewrapping in edit menu. Resolves: rhbz #976643 --- grub2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index a71366d..bddf7bb 100644 --- a/grub2.spec +++ b/grub2.spec @@ -41,7 +41,7 @@ Name: grub2 Epoch: 1 Version: 2.00 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -923,7 +923,7 @@ fi %{_datarootdir}/grub/themes/ %changelog -* Fri Jun 21 2013 Peter Jones - 2.00-21 +* Fri Jun 21 2013 Peter Jones - 2.00-22 - Fix linewrapping in edit menu. Resolves: rhbz #976643 From d0b05a7eb95dc362d1330417c9e3052188cd35c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 2 Jul 2013 13:20:08 -0500 Subject: [PATCH 3/3] add epoch to obsoletes --- grub2.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/grub2.spec b/grub2.spec index bddf7bb..81f875b 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 @@ -564,7 +564,7 @@ Requires(pre): dracut Requires(post): dracut ExcludeArch: s390 s390x %{arm} -Obsoletes: grub2 <= 2.00-20%{?dist} +Obsoletes: grub2 <= 1:2.00-20%{?dist} %description The GRand Unified Bootloader (GRUB) is a highly configurable and customizable @@ -577,7 +577,7 @@ provides support for PC BIOS systems. Summary: GRUB for EFI systems. Group: System Environment/Base Requires: %{name}-tools = %{epoch}:%{version}-%{release} -Obsoletes: grub2-efi <= 2.00-20%{?dist} +Obsoletes: grub2-efi <= 1:2.00-20%{?dist} %description efi The GRand Unified Bootloader (GRUB) is a highly configurable and customizable @@ -601,8 +601,8 @@ provides tools for support of all platforms. Summary: An example theme for GRUB. Group: System Environment/Base Requires: system-logos -Obsoletes: grub2 <= 2.00-20%{?dist} -Obsoletes: grub2-efi <= 2.00-20%{?dist} +Obsoletes: grub2 <= 1:2.00-20%{?dist} +Obsoletes: grub2-efi <= 1:2.00-20%{?dist} %description starfield-theme The GRand Unified Bootloader (GRUB) is a highly configurable and customizable @@ -923,6 +923,9 @@ fi %{_datarootdir}/grub/themes/ %changelog +* Tue Jul 02 2013 Dennis Gilmore - 2.00-23 +- add epoch to obsoletes + * Fri Jun 21 2013 Peter Jones - 2.00-22 - Fix linewrapping in edit menu. Resolves: rhbz #976643