From c64aa4371ede1917f1b461b0a2932a12d051785d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 9 Apr 2011 22:52:37 +0100
Subject: [PATCH] Include upstream fix for virt-resize build.

---
 ...size-Link-with-local-copy-of-guestfs.patch | 31 +++++++++++++++++++
 libguestfs.spec                               | 10 ++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 0001-resize-Link-with-local-copy-of-guestfs.patch

diff --git a/0001-resize-Link-with-local-copy-of-guestfs.patch b/0001-resize-Link-with-local-copy-of-guestfs.patch
new file mode 100644
index 0000000..92e2788
--- /dev/null
+++ b/0001-resize-Link-with-local-copy-of-guestfs.patch
@@ -0,0 +1,31 @@
+From 047173d18683a66cbe8949bc114833984898fed6 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Sat, 9 Apr 2011 22:50:15 +0100
+Subject: [PATCH] resize: Link with local copy of guestfs.
+
+---
+ resize/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/resize/Makefile.am b/resize/Makefile.am
+index 1d341d8..3740a4a 100644
+--- a/resize/Makefile.am
++++ b/resize/Makefile.am
+@@ -42,12 +42,12 @@ OBJECTS = \
+ 
+ bin_SCRIPTS = virt-resize
+ 
+-OCAMLPACKAGES = -package guestfs,pcre
++OCAMLPACKAGES = -package pcre -I ../ocaml
+ OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
+ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+ 
+ virt-resize: $(OBJECTS)
+-	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -linkpkg $^ -o $@
++	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) mlguestfs.cmxa -linkpkg $^ -o $@
+ 
+ .mli.cmi:
+ 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
+-- 
+1.7.4.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index c7619c3..a0d4121 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.9.18
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -40,6 +40,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.7.13-no-fuse-test.patch
 
+# ocaml: Link with local copy of guestfs.
+# Patch upstream in > 1.9.18.
+Patch1:        0001-resize-Link-with-local-copy-of-guestfs.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -434,6 +438,7 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -772,10 +777,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Apr  9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-1
+* Wed Apr  9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-2
 - New upstream version 1.9.18.
 - Requires ocaml-pcre for new virt-resize.
 - Remove libguestfs-test-tool-helper program which is no longer used.
+- Include upstream fix for virt-resize build.
 
 * Wed Apr  6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.17-2
 - Remove partially translated Ukrainian manpages.