Removed Mac AFP table from iso; grub2 theme fixed

livecd-tools-21.1.no.mac.img.patch

@@ -0,0 +1,36 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index 269e425..15c0a7c 100755
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -331,7 +331,7 @@ class LiveImageCreatorBase(LoopImageCreator):
+ 
+         if os.path.exists("/usr/bin/isohybrid"):
+             if os.path.exists(isodir + "/isolinux/efiboot.img"):
+-                subprocess.call(["/usr/bin/isohybrid", "-u", "-m", iso])
++                subprocess.call(["/usr/bin/isohybrid", "-u", iso])
+                 subprocess.call(["/usr/bin/rosa-image-fix-x86.pl", iso])
+                 logging.warn("iso hacked with x86 version of script")
+ 
+@@ -403,9 +403,9 @@ class x86LiveImageCreator(LiveImageCreatorBase):
+         if os.path.exists(isodir + "/isolinux/efiboot.img"):
+             options.extend([ "-eltorito-alt-boot",
+                              "-e", "isolinux/efiboot.img",
+-                             "-no-emul-boot",
+-                             "-eltorito-alt-boot",
+-                             "-e", "isolinux/macboot.img",
++#                             "-no-emul-boot",
++#                             "-eltorito-alt-boot",
++#                             "-e", "isolinux/macboot.img",
+                              "-no-emul-boot"])
+         return options
+ 
+@@ -752,7 +752,8 @@ menu end
+                 missing.append("Missing EFI file (%s)" % (src,))
+                 fail = True
+             else:
+-                shutil.copy(src_glob[0], isodir+dest)
++                for src_file in src_glob:
++                    shutil.copy(src_file, isodir+dest)
+         map(logging.error, missing)
+         return fail
+ 

livecd-tools.spec

@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 21.1
-Release: 9
+Release: 10
 Epoch: 1
 License: GPLv2
 Group: System/Base
@@ -20,6 +20,7 @@ Patch3: livecd-tools-21.1.hack.patch
 Patch4: livecd-tools-21.1.hack2.patch
 Patch5: livecd-tools-21.1.hack3.patch
 Patch6: livecd-tools-21.1.hack4.patch
+Patch7: livecd-tools-21.1.no.mac.img.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@@ -75,6 +76,7 @@ like live image or appliances.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make