From 2ed2e345b675040c09fa90b39e7044606494a231 Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Thu, 10 May 2012 11:22:27 +0200
Subject: [PATCH] Revert "Disable macboot.img on RHEL"

This reverts commit 45ee5bf23b828a78c6b2005719300792b76319cf.

Conflicts:

	lorax.spec
---
 lorax-disable-macboot-img.patch | 27 ---------------------------
 lorax.spec                      |  5 -----
 2 files changed, 32 deletions(-)
 delete mode 100644 lorax-disable-macboot-img.patch

diff --git a/lorax-disable-macboot-img.patch b/lorax-disable-macboot-img.patch
deleted file mode 100644
index e32f2c2a..00000000
--- a/lorax-disable-macboot-img.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a/share/efi.tmpl b/share/efi.tmpl
---- a/share/efi.tmpl	2012-01-12 16:05:52.000000000 +0100
-+++ b/share/efi.tmpl	2012-01-13 12:23:47.238239411 +0100
-@@ -10,7 +10,6 @@
- 
- ## actually make the EFI images
- ${make_efiboot("images/efiboot.img")}
--${make_efiboot("images/macboot.img", imgtype="apple")}
- 
- ## This is kinda gross, but then... so's EFI.
- <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')">
-diff -Naur a/share/x86.tmpl b/share/x86.tmpl
---- a/share/x86.tmpl	2012-01-12 16:05:52.000000000 +0100
-+++ b/share/x86.tmpl	2012-01-13 14:10:04.168384841 +0100
-@@ -53,10 +53,10 @@
-     <%
-     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
-     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
--    for img in ("images/efiboot.img", "images/macboot.img"):
-+    for img in ("images/efiboot.img", ):
-         efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
-         efigraft += " {0}={1}/{0}".format(img,outroot)
--    efihybrid="--uefi --mac"
-+    efihybrid="--uefi"
-     %>
-     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
- %endif
diff --git a/lorax.spec b/lorax.spec
index 1f122841..86a5c3a1 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -9,7 +9,6 @@ Group:          Applications/System
 License:        GPLv2+
 URL:            http://git.fedorahosted.org/git/?p=lorax.git
 Source0:        https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         lorax-disable-macboot-img.patch
 
 BuildRequires:  python2-devel
 Requires:       python-mako
@@ -58,10 +57,6 @@ Anaconda's image install feature.
 
 %prep
 %setup -q
-# disable macboot.img on RHEL
-%if 0%{?rhel}
-%patch0 -p1
-%endif
 
 %build