[lorax/f20] - Bless grub2 for PPC (#1020112) (catacombe)

[Brian C. Lane]

commit a83c18fafc8ff2739d9c64dd1cad2cc9bd63d20a
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Dec 11 10:59:31 2013 -0800

    - Bless grub2 for PPC (#1020112) (catacombe)

 0001-Bless-grub2-for-PPC-1020112.patch |   37 ++++++++++++++++++++++++++++++++
 lorax.spec                             |    8 ++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/0001-Bless-grub2-for-PPC-1020112.patch b/0001-Bless-grub2-for-PPC-1020112.patch
new file mode 100644
index 0000000..13433bc
--- /dev/null
+++ b/0001-Bless-grub2-for-PPC-1020112.patch
@@ -0,0 +1,37 @@
+From 0b825ab3abf7312d8b737acef858a7dbdf0601e9 Mon Sep 17 00:00:00 2001
+From: Erik Larsson <catacombae at gmail.com>
+Date: Mon, 9 Dec 2013 08:59:26 -0800
+Subject: [PATCH] Bless grub2 for PPC (#1020112)
+
+---
+ share/config_files/ppc/mapping | 1 +
+ share/ppc.tmpl                 | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/share/config_files/ppc/mapping b/share/config_files/ppc/mapping
+index cf83076..c3eec9e 100644
+--- a/share/config_files/ppc/mapping
++++ b/share/config_files/ppc/mapping
+@@ -23,5 +23,6 @@ RELEASE_NOTES   Ascii   'ttxt'  'ttro'  "Text File"
+ .tbxi           Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file"
+ .sea            Raw     'aust'  'APPL'  "Self Expanding Archive"
+ .sit            Raw     'SIT!'  'SITD'  "Stuffit Expander file"
++core.elf        Raw     'chrp'  'tbxi'  "Bootable GRUB2 executable."
+ *               Raw     '????'  '????'  "Unknown"
+ 
+diff --git a/share/ppc.tmpl b/share/ppc.tmpl
+index 025f1df..8d4f810 100644
+--- a/share/ppc.tmpl
++++ b/share/ppc.tmpl
+@@ -4,7 +4,7 @@ configdir="tmp/config_files/ppc"
+ BOOTDIR="ppc"
+ GRUBDIR="boot/grub"
+ LIVEDIR="LiveOS"
+-MACDIR=BOOTDIR+"/mac"
++MACDIR=GRUBDIR+"/powerpc-ieee1275"
+ NETBOOTDIR="images/netboot"
+ 
+ WRAPPER="usr/sbin/wrapper"
+-- 
+1.8.3.1
+
diff --git a/lorax.spec b/lorax.spec
index 56c9acd..ae90ecc 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -2,7 +2,7 @@
 
 Name:           lorax
 Version:        20.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
@@ -10,6 +10,8 @@ License:        GPLv2+
 URL:            http://git.fedorahosted.org/git/?p=lorax.git
 Source0:        https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.gz
 
+Patch0:         0001-Bless-grub2-for-PPC-1020112.patch
+
 BuildRequires:  python2-devel
 
 Requires:       GConf2
@@ -69,6 +71,7 @@ Anaconda's image install feature.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -93,6 +96,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Dec 11 2013 Brian C. Lane <bcl at redhat.com> 20.4-2
+- Bless grub2 for PPC (#1020112) (catacombe)
+
 * Mon Nov 18 2013 Brian C. Lane <bcl at redhat.com> 20.4-1
 - drop 'xdriver=vesa' from basic graphics mode parameters (per ajax)
   (awilliam at redhat.com)