diff --git a/0001-resize-Depend-explicitly-on-Unix-module.patch b/0001-resize-Depend-explicitly-on-Unix-module.patch new file mode 100644 index 0000000..71bfceb --- /dev/null +++ b/0001-resize-Depend-explicitly-on-Unix-module.patch @@ -0,0 +1,31 @@ +From a66fd2fac25d5520b4eb2935dea6a501daed946a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 22 Oct 2012 12:18:40 +0100 +Subject: [PATCH] resize: Depend explicitly on Unix module. + +Commit a0722c7ad846960be54978a31ebe73b76e119203 introduced a +dependency on the Unix module. This was not listed in the list of +'-package's, but as long as you had ocaml-gettext installed it would +still work because that pulled in Unix implicitly. + +Thanks Olaf Hering. +--- + resize/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resize/Makefile.am b/resize/Makefile.am +index 31fd71b..7d4cade 100644 +--- a/resize/Makefile.am ++++ b/resize/Makefile.am +@@ -56,7 +56,7 @@ bin_SCRIPTS = virt-resize + # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L + # option to be passed to gcc, so we don't try linking against an + # installed copy of libguestfs. +-OCAMLPACKAGES = -package str -I $(top_builddir)/src/.libs -I ../ocaml ++OCAMLPACKAGES = -package str,unix -I $(top_builddir)/src/.libs -I ../ocaml + if HAVE_OCAML_PKG_GETTEXT + OCAMLPACKAGES += -package gettext-stub + endif +-- +1.7.11.4 + diff --git a/libguestfs.spec b/libguestfs.spec index 28109f8..fe1cde4 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -79,6 +79,7 @@ License: LGPL-2.1 Group: System/Filesystems Version: 1.19.53 Release: 0 +Patch0: 0001-resize-Depend-explicitly-on-Unix-module.patch Patch5: libguestfs-1.13.14-ruby.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.gz @@ -356,6 +357,7 @@ virtual machines. %prep %setup -q +%patch0 -p1 %patch5 -p1 %patch1000 -p1