From 96a9f914e825e816aa5613c6f91d5fe0a0e0c763 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Wed, 25 Oct 2017 12:06:21 +1000
Subject: [PATCH] Force genisoimage instead of mkisofs

---
 livecd-tools-21.1-genisoimage.patch | 12 ++++++++++++
 livecd-tools.spec                   |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 livecd-tools-21.1-genisoimage.patch

diff --git a/livecd-tools-21.1-genisoimage.patch b/livecd-tools-21.1-genisoimage.patch
new file mode 100644
index 0000000..bb1aa87
--- /dev/null
+++ b/livecd-tools-21.1-genisoimage.patch
@@ -0,0 +1,12 @@
+diff -urN livecd-tools-21.1/imgcreate/live.py livecd-tools-21.1-patched/imgcreate/live.py
+--- livecd-tools-21.1/imgcreate/live.py	2017-10-25 11:52:39.634719874 +1000
++++ livecd-tools-21.1-patched/imgcreate/live.py	2017-10-25 11:53:44.552718170 +1000
+@@ -314,7 +314,7 @@
+     def __create_iso(self, isodir):
+         iso = self._outdir + "/" + self.name + ".iso"
+ 
+-        args = ["/usr/bin/mkisofs",
++        args = ["/usr/bin/genisoimage",
+                 "-J", "-r",
+                 "-hide-rr-moved", "-hide-joliet-trans-tbl",
+                 "-V", self.fslabel,
diff --git a/livecd-tools.spec b/livecd-tools.spec
index a7dcaf7..5d20ce0 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -3,7 +3,7 @@
 Summary:	Tools for building live CDs
 Name:		livecd-tools
 Version:	21.1
-Release:	32
+Release:	33
 Epoch:		1
 License:	GPLv2+
 Group:		System/Base
@@ -32,12 +32,13 @@ Patch19:	livecd-tools-21.1.support.efi32.patch
 Patch20:	livecd-tools-21.1.verify.signatures.patch
 Patch21:	livecd-tools-21.1.use.add_drivers.patch
 Patch22:	livecd-tools-21.1.no.vga.opts.patch
+Patch23:	livecd-tools-21.1-genisoimage.patch
 
 Requires:	python-imgcreate = %{EVRD}
 Requires:	dosfstools
 Requires:	dumpet
 Requires:	e2fsprogs
-Requires:	mkisofs
+Requires:	cdrkit-genisoimage
 Requires:	isomd5sum
 Requires:	lorax >= 18.3
 Requires:	parted