From e12127ec3eac50a118e832491da9d72cefbab1c0ff9d5679a1ae5560115e37fd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 1 Feb 2017 08:49:54 +0000 Subject: [PATCH] Accepting request 452460 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/452460 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=150 --- grub2.changes | 5 +++++ grub2.spec | 2 ++ info-dir-entry.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 info-dir-entry.patch diff --git a/grub2.changes b/grub2.changes index 3844b2b..9db156a 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 09:58:20 UTC 2017 - schwab@linux-m68k.org + +- info-dir-entry.patch: Update info dir entry to follow renaming to grub2 + ------------------------------------------------------------------- Mon Jan 16 10:15:52 UTC 2017 - matwey.kornilov@gmail.com diff --git a/grub2.spec b/grub2.spec index b15518c..96ccc2b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -151,6 +151,7 @@ Source1000: PATCH_POLICY Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch Patch3: use-grub2-as-a-package-name.patch +Patch4: info-dir-entry.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch8: grub2-ppc-terminfo.patch Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch @@ -412,6 +413,7 @@ swap partition while in resuming %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch6 -p1 %patch8 -p1 %patch9 -p1 diff --git a/info-dir-entry.patch b/info-dir-entry.patch new file mode 100644 index 0000000..4a9a9af --- /dev/null +++ b/info-dir-entry.patch @@ -0,0 +1,29 @@ +Index: grub-2.02~beta3/docs/grub.texi +=================================================================== +--- grub-2.02~beta3.orig/docs/grub.texi ++++ grub-2.02~beta3/docs/grub.texi +@@ -32,15 +32,15 @@ Invariant Sections. + + @dircategory Kernel + @direntry +-* GRUB: (grub). The GRand Unified Bootloader +-* grub-install: (grub)Invoking grub-install. Install GRUB on your drive +-* grub-mkconfig: (grub)Invoking grub-mkconfig. Generate GRUB configuration +-* grub-mkpasswd-pbkdf2: (grub)Invoking grub-mkpasswd-pbkdf2. +-* grub-mkrelpath: (grub)Invoking grub-mkrelpath. +-* grub-mkrescue: (grub)Invoking grub-mkrescue. Make a GRUB rescue image +-* grub-mount: (grub)Invoking grub-mount. Mount a file system using GRUB +-* grub-probe: (grub)Invoking grub-probe. Probe device information +-* grub-script-check: (grub)Invoking grub-script-check. ++* GRUB2: (grub2). The GRand Unified Bootloader ++* grub2-install: (grub2)Invoking grub-install. Install GRUB on your drive ++* grub2-mkconfig: (grub2)Invoking grub-mkconfig. Generate GRUB configuration ++* grub2-mkpasswd-pbkdf2: (grub2)Invoking grub-mkpasswd-pbkdf2. ++* grub2-mkrelpath: (grub2)Invoking grub-mkrelpath. ++* grub2-mkrescue: (grub2)Invoking grub-mkrescue. Make a GRUB rescue image ++* grub2-mount: (grub2)Invoking grub-mount. Mount a file system using GRUB ++* grub2-probe: (grub2)Invoking grub-probe. Probe device information ++* grub2-script-check: (grub2)Invoking grub-script-check. + @end direntry + + @setchapternewpage odd