[hivex/f15] - Add upstream patch to fix Ruby tests. (cherry picked from commit 428b95f6afa9dca912037ac22908a1239

[Richard W.M. Jones]

commit 02929ca0d038f25d4522fdf74180bb50907b1285
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Aug 15 11:10:02 2011 +0100

    - Add upstream patch to fix Ruby tests.
    (cherry picked from commit 428b95f6afa9dca912037ac22908a1239399d2f8)

 0001-ruby-Test-against-locally-built-library.patch |   25 ++++++++++++++++++++
 hivex.spec                                         |    9 +++++-
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/0001-ruby-Test-against-locally-built-library.patch b/0001-ruby-Test-against-locally-built-library.patch
new file mode 100644
index 0000000..902c54c
--- /dev/null
+++ b/0001-ruby-Test-against-locally-built-library.patch
@@ -0,0 +1,25 @@
+From 7cc9be00d446df95eaa0bebfc9892a69d3393227 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Mon, 15 Aug 2011 11:08:16 +0100
+Subject: [PATCH] ruby: Test against locally built library.
+
+---
+ ruby/run-ruby-tests |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/ruby/run-ruby-tests b/ruby/run-ruby-tests
+index 1ef116c..1596c87 100755
+--- a/ruby/run-ruby-tests
++++ b/ruby/run-ruby-tests
+@@ -18,6 +18,8 @@
+ 
+ set -e
+ 
++export LD_LIBRARY_PATH=../lib/.libs
++
+ # Run them one at a time, otherwise rake runs them in parallel (which
+ # is bound to fail because they all use a single test image file).
+ 
+-- 
+1.7.6
+
diff --git a/hivex.spec b/hivex.spec
index ca8ff23..2fc81e6 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -7,7 +7,7 @@
 
 Name:           hivex
 Version:        1.3.0
-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: ruby: Test against locally built library.
+Patch1:         0001-ruby-Test-against-locally-built-library.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
@@ -282,9 +286,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 15 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.0-1
+* Mon Aug 15 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.0-2
 - New upstream version 1.3.0.
 - This version adds Ruby bindings, so there is a new subpackage 'ruby-hivex'.
+- Add upstream patch to fix Ruby tests.
 
 * Fri Aug 12 2011 Richard W.M. Jones <rjones at redhat.com> - 1.2.8-1
 - New upstream version 1.2.8.