From 6147cec35064150944d38b604b9f1a129355cd22 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Sep 26 2011 18:55:54 +0000
Subject: - New upstream version 1.3.1.

- Remove patch, now upstream.
(cherry picked from commit 3616f40527eb9478855d22cd73ecae43484ee2dd)

---

diff --git a/.gitignore b/.gitignore
index dab5129..1918a78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ hivex-1.2.2.tar.gz
 /hivex-1.2.7.tar.gz
 /hivex-1.2.8.tar.gz
 /hivex-1.3.0.tar.gz
+/hivex-1.3.1.tar.gz
diff --git a/0001-ruby-Test-against-locally-built-library.patch b/0001-ruby-Test-against-locally-built-library.patch
deleted file mode 100644
index 902c54c..0000000
--- a/0001-ruby-Test-against-locally-built-library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
diff --git a/hivex.spec b/hivex.spec
index 86d0124..bc9a3b9 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           hivex
-Version:        1.3.0
-Release:        3%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -40,9 +40,6 @@ 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
@@ -166,7 +163,6 @@ ruby-%{name} contains Ruby bindings for %{name}.
 %setup -q
 
 %patch0 -p1 -b .dirs
-%patch1 -p1
 
 
 %build
@@ -286,6 +282,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 26 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.1-1
+- New upstream version 1.3.1.
+- Remove patch, now upstream.
+
 * Mon Aug 15 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.0-3
 - New upstream version 1.3.0.
 - This version adds Ruby bindings, so there is a new subpackage 'ruby-hivex'.
diff --git a/sources b/sources
index 42ab0ad..7dbfa44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9102b7bd9f1a348cb955dfdcfa179eeb  hivex-1.3.0.tar.gz
+fa38e8ea348c750046b4f34c573e0c32  hivex-1.3.1.tar.gz