From 9c12726cd9c187e74812a4088e9995ca8655112c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 12 Sep 2012 20:41:57 -0700
Subject: [PATCH] efi_requires.patch: don't force grub2-efi and shim into the
 package list

---
 livecd-tools-18.10-efi_requires.patch | 12 ++++++++++++
 livecd-tools.spec                     | 12 ++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 livecd-tools-18.10-efi_requires.patch

diff --git a/livecd-tools-18.10-efi_requires.patch b/livecd-tools-18.10-efi_requires.patch
new file mode 100644
index 0000000..064c3c7
--- /dev/null
+++ b/livecd-tools-18.10-efi_requires.patch
@@ -0,0 +1,12 @@
+--- livecd-tools-18.10/imgcreate/live.py	2012-09-06 16:38:20.000000000 -0700
++++ livecd-tools-18.10/imgcreate/live.py.new	2012-09-12 20:29:23.006686900 -0700
+@@ -400,8 +400,7 @@
+         return options
+ 
+     def _get_required_packages(self):
+-        return ["syslinux", "grub2-efi", "shim"] \
+-               + LiveImageCreatorBase._get_required_packages(self)
++        return ["syslinux"] + LiveImageCreatorBase._get_required_packages(self)
+ 
+     def _get_isolinux_stanzas(self, isodir):
+         return ""
diff --git a/livecd-tools.spec b/livecd-tools.spec
index b6d3177..546001e 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 18.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Base
@@ -16,6 +16,9 @@ URL: http://git.fedorahosted.org/git/livecd
 # make dist
 # scp livecd*.tar.bz2 fedorahosted.org:livecd
 Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
+# Drop the requirements for grub2-efi and shim: breaks 32-bit compose
+# and not needed as we have them in comps
+Patch0: livecd-tools-18.10-efi_requires.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{epoch}:%{version}-%{release}
 Requires: mkisofs
@@ -66,6 +69,7 @@ like live image or appliances.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -99,7 +103,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
-* Thu Sep 06 2012 Brian C. Lane <bcl@redhat.com> 18.9-1
+* Wed Sep 12 2012 Adam Williamson <awilliam@redhat.com> 18.10-2
+- efi_requires.patch: don't force grub2-efi and shim into the package
+  list, it breaks 32-bit compose and isn't needed, we have it in comps
+
+* Thu Sep 06 2012 Brian C. Lane <bcl@redhat.com> 18.10-1
 - Version 18.10 (bcl)
 - use cp -r instead of -a (bcl)