From 68a20dab23668e9b1973994308dcabde8407fd6f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Oct 24 2011 17:17:27 +0000
Subject: Add upstream patch to fix building of hivexsh, hivexget.


---

diff --git a/0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch b/0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch
new file mode 100644
index 0000000..195ddfd
--- /dev/null
+++ b/0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch
@@ -0,0 +1,36 @@
+From a6ba26dca8dd496bec71d65746b3c3b65e604f03 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 24 Oct 2011 18:15:48 +0100
+Subject: [PATCH] Fix conditional test for HAVE_HIVEXSH.
+
+This fixes commit 0a28041f4156878a74543966f9a72ed3d214ba44.
+---
+ configure.ac |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 617ec50..547bf0a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -137,7 +137,7 @@ dnl Check for mmap
+ AC_REPLACE_FUNCS([mmap])
+ 
+ dnl Functions.
+-AC_CHECK_FUNCS([bindtextdomain open_memstream])
++AC_CHECK_FUNCS([bindtextdomain])
+ 
+ dnl Check for pod2man and pod2text.
+ AC_CHECK_PROG([POD2MAN],[pod2man],[pod2man],[no])
+@@ -177,7 +177,8 @@ AC_SUBST([LIBXML2_CFLAGS])
+ AC_SUBST([LIBXML2_LIBS])
+ 
+ dnl hivexsh depends on open_memstream, which is absent on OS X.
+-AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$HAVE_OPEN_MEMSTREAM" = "xyes"])
++AC_CHECK_FUNC([open_memstream])
++AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"])
+ 
+ dnl Check for OCaml (optional, for OCaml bindings).
+ AC_PROG_OCAML
+-- 
+1.7.6
+
diff --git a/hivex.spec b/hivex.spec
index 7108019..3ec64e3 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -7,7 +7,7 @@
 
 Name:           hivex
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -40,6 +40,9 @@ Conflicts:      libguestfs <= 1:1.0.84
 # Fix Perl directory install path.
 Patch0:         %{name}-1.2.3-dirs.patch
 
+# Upstream patch to fix building hivexsh, hivexget commands.
+Patch1:         0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch
+
 
 %description
 Hive files are the undocumented binary blobs that Windows uses to
@@ -163,6 +166,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
 %setup -q
 
 %patch0 -p1 -b .dirs
+%patch1 -p1
 
 
 %build
@@ -275,8 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-1
+* Mon Oct 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-2
 - New upstream version 1.3.2.
+- Add upstream patch to fix building of hivexsh, hivexget.
 
 * Fri Aug 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-2
 - New upstream version 1.3.1.