- Add upstream patch to fix Ruby tests.

This commit is contained in:
Richard W.M. Jones 2011-08-15 11:10:02 +01:00
parent 54ce3b6ecc
commit 428b95f6af
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 7cc9be00d446df95eaa0bebfc9892a69d3393227 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@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

View File

@ -7,7 +7,7 @@
Name: hivex Name: hivex
Version: 1.3.0 Version: 1.3.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries Group: Development/Libraries
@ -40,6 +40,9 @@ Conflicts: libguestfs <= 1:1.0.84
# Fix Perl directory install path. # Fix Perl directory install path.
Patch0: %{name}-1.2.3-dirs.patch 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 %description
Hive files are the undocumented binary blobs that Windows uses to Hive files are the undocumented binary blobs that Windows uses to
@ -163,6 +166,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
%setup -q %setup -q
%patch0 -p1 -b .dirs %patch0 -p1 -b .dirs
%patch1 -p1
%build %build
@ -282,9 +286,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Aug 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-1 * Mon Aug 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-2
- New upstream version 1.3.0. - New upstream version 1.3.0.
- This version adds Ruby bindings, so there is a new subpackage 'ruby-hivex'. - 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@redhat.com> - 1.2.8-1 * Fri Aug 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.8-1
- New upstream version 1.2.8. - New upstream version 1.2.8.