rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 162520 from home:arvidjaar:branches:Base:System

Browse Source 
Upstream documentation sometimes changes and quilt does not support
renaming files. This makes it easier to maintain moving target. This
is to prepare for grub2-next submission (it is part of it, but I'd
prefer to make it explicit in case there are reasons for current patch).

OBS-URL: https://build.opensuse.org/request/show/162520
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=36
This commit is contained in:
Jiri Slaby 2013-04-03 19:52:45 +00:00 committed by Git OBS Bridge
parent 4419848f19
commit 31f29ac911
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grub2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 3 17:56:20 UTC 2013 - arvidjaar@gmail.com
- update rename-grub-info-file-to-grub2.patch
* do not rename docs/grub2.texi here, do it in %%prep (we do it there
conditionally already). It simplifies patch refreshing using quilt
which does not support file rename.
-------------------------------------------------------------------
Wed Apr 3 06:55:52 UTC 2013 - mchang@suse.com

5
grub2.spec
View File

@ -221,10 +221,9 @@ provides support for EFI systems.
(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
%patch0 -p1
%patch1 -p1
# Workaround SLE11's patch utility did not rename the file for us
%if 0%{?suse_version} == 1110
# This simplifies patch handling without need to use git to create patch
# that renames file
mv docs/grub.texi docs/grub2.texi
%endif
%patch2 -p1
%patch3 -p1
%patch6 -p1

11
rename-grub-info-file-to-grub2.patch
View File

@ -4,6 +4,12 @@ Date: Sun, 24 Jun 2012 15:40:40 +0200
Subject: [PATCH] rename grub info file to grub2
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
From: Andrey Borzenkov <arvidjaar@gmail.com>
Do not rename file here. quilt does not support it and creates the
whole file if patch needs refreshing. It means that to regenerate two
files - Makefile.core.am and Makefile.util.am - it may be necessary to
manually rename it.
---
docs/Makefile.am | 2 +-
docs/Makefile.in | 46 ++++++++++++++++++++--------------------
@ -116,12 +122,9 @@ index 217ea7e..49dc477 100644
maintainer-clean-aminfo:
diff --git a/docs/grub.texi b/docs/grub2.texi
similarity index 99%
rename from docs/grub.texi
rename to docs/grub2.texi
index 26944ac..fb7fb0e 100644
--- a/docs/grub.texi
+++ b/docs/grub2.texi
+++ b/docs/grub.texi
@@ -1,7 +1,7 @@
\input texinfo
@c -*-texinfo-*-