From 3801bfdc741bb08ef654ae594187099fd930e8e2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 15:50:04 -0400 Subject: [PATCH] Move bash completions to their new location. Signed-off-by: Peter Jones --- grub-2.00-move-bash-completions.patch | 26 ++++++++++++++++++++++++++ grub2.spec | 6 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 grub-2.00-move-bash-completions.patch diff --git a/grub-2.00-move-bash-completions.patch b/grub-2.00-move-bash-completions.patch new file mode 100644 index 00000000..a15aaf53 --- /dev/null +++ b/grub-2.00-move-bash-completions.patch @@ -0,0 +1,26 @@ +From 6713bba005b733b3c74fafbdb7c655dd6635bd15 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 3 Apr 2013 14:35:34 -0400 +Subject: [PATCH] Move bash completion script (#922997) + +Apparently these go in a new place now. +--- + util/bash-completion.d/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am +index 136287c..9aaaee0 100644 +--- a/util/bash-completion.d/Makefile.am ++++ b/util/bash-completion.d/Makefile.am +@@ -6,7 +6,7 @@ EXTRA_DIST = $(bash_completion_source) + + CLEANFILES = $(bash_completion_script) config.log + +-bashcompletiondir = $(sysconfdir)/bash_completion.d ++bashcompletiondir = $(datarootdir)/bash-completion/completions + bashcompletion_DATA = $(bash_completion_script) + + $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status +-- +1.8.1.4 + diff --git a/grub2.spec b/grub2.spec index 78f9010b..dc63b4ec 100644 --- a/grub2.spec +++ b/grub2.spec @@ -41,7 +41,7 @@ Name: grub2 Epoch: 1 Version: 2.00 -Release: 17%{?dist} +Release: 17%{?dist}.pj0 Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -81,6 +81,7 @@ Patch37: grub2-add-bootpath-device-to-the-list.patch Patch38: grub-2.00-add-GRUB-DISABLE-SUBMENU-option.patch Patch39: grub-2.00-support-bls-config.patch Patch40: grub-2.00-handle-4k-sectors.patch +Patch41: grub-2.00-move-bash-completions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -414,7 +415,7 @@ fi %{_bindir}/%{name}-mkrescue %endif %{_bindir}/%{name}-script-check -%{_sysconfdir}/bash_completion.d/grub +%{_datarootdir}/bash-completion/completions/grub %{_sysconfdir}/prelink.conf.d/grub2.conf %attr(0700,root,root) %dir %{_sysconfdir}/grub.d %config %{_sysconfdir}/grub.d/??_* @@ -436,6 +437,7 @@ fi %changelog * Wed Apr 03 2013 Peter Jones - 2.00-17 - Fix booting from drives with 4k sectors on UEFI. +- Move bash completion to new location (#922997). * Thu Feb 14 2013 Peter Jones - 2.00-16 - Allow the user to disable submenu generation