From bf52e4d95b0c1f76f8baebde02c02a7907fee2e2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 10 May 2012 16:34:23 -0400 Subject: [PATCH] Move mads' sed to a patch so it doesn't clutter up the git diff. --- grub2-2.0-no-png-in-texi.patch | 25 +++++++++++++++++++++++++ grub2.spec | 4 +--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 grub2-2.0-no-png-in-texi.patch diff --git a/grub2-2.0-no-png-in-texi.patch b/grub2-2.0-no-png-in-texi.patch new file mode 100644 index 0000000..b8b6058 --- /dev/null +++ b/grub2-2.0-no-png-in-texi.patch @@ -0,0 +1,25 @@ +From e3c5e7e3accaced35b3e3ee367068d14bbce91bf Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 10 May 2012 16:31:29 -0400 +Subject: [PATCH] Specifying .png in @image doesn't work - leaving it out + +--- + docs/grub-dev.texi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi +index 51b4787..ddde5e9 100644 +--- a/docs/grub-dev.texi ++++ b/docs/grub-dev.texi +@@ -1689,7 +1689,7 @@ right edges of two adjacent glyphs. The @strong{device width} field determines + the effective leading value that is used to render the font. + + @end itemize +-@image{font_char_metrics,,,,.png} ++@image{font_char_metrics,,,,} + + An illustration of how the various font metrics apply to characters. + +-- +1.7.10.1 + diff --git a/grub2.spec b/grub2.spec index 941cf41..7131c1f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -40,6 +40,7 @@ Patch3: grub2-handle-initramfs-on-xen.patch Patch4: grub-1.99-Fix-tests-of-zeroed-partition.patch Patch5: grub-1.99-ppc-terminfo.patch Patch7: grub-2.00~beta4-add-support-for-PowerMac-HFS-partitions.patch +Patch8: grub2-2.0-no-png-in-texi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -109,9 +110,6 @@ git add . git commit -a -q -m "%{tarversion} baseline." git am %{patches} -# Specifying .png in @image doesn't work - leaving it out -sed -i 's,\.png,,g' docs/grub-dev.texi - %build %ifarch %{efi} cd grub-efi-%{tarversion}