[hivex/f15] New upstream version 1.2.6. (cherry picked from commit f796c3682d91a36f1f1a43dbafb8453afa708579)

[Richard W.M. Jones]

commit 073b623a4bdb015aff697e3b38454e8acc21594a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu May 12 12:12:18 2011 +0100

    New upstream version 1.2.6.
    (cherry picked from commit f796c3682d91a36f1f1a43dbafb8453afa708579)

 .gitignore                                         |    1 +
 ....5-python-fix-for-i386-integer-size-issue.patch |  164 --------------------
 hivex.spec                                         |   12 +-
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 171 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d68e39..a0792be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ hivex-1.2.2.tar.gz
 /hivex-1.2.3.tar.gz
 /hivex-1.2.4.tar.gz
 /hivex-1.2.5.tar.gz
+/hivex-1.2.6.tar.gz
diff --git a/hivex.spec b/hivex.spec
index 5406e50..468cdf3 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           hivex
-Version:        1.2.5
-Release:        2%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -38,9 +38,6 @@ Conflicts:      libguestfs <= 1:1.0.84
 # Fix Perl directory install path.
 Patch0:         %{name}-1.2.3-dirs.patch
 
-# Fix Python bindings on 32 bit arch (patch is upstream).
-Patch1:         hivex-1.2.5-python-fix-for-i386-integer-size-issue.patch
-
 
 %description
 Hive files are the undocumented binary blobs that Windows uses to
@@ -147,7 +144,6 @@ python-%{name} contains Python bindings for %{name}.
 %setup -q
 
 %patch0 -p1 -b .dirs
-%patch1 -p0 -b .32bit
 
 
 %build
@@ -256,6 +252,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 12 2011 Richard W.M. Jones <rjones at redhat.com> - 1.2.6-1
+- New upstream version 1.2.6.
+- Removed patch which is now upstream.
+
 * Thu Apr 28 2011 Richard W.M. Jones <rjones at redhat.com> - 1.2.5-2
 - Fix Python bindings on 32 bit arch with upstream patch.
 
diff --git a/sources b/sources
index b1cc7a3..1f47732 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a15c388afd46a791e9d94b70cb16e76  hivex-1.2.5.tar.gz
+6eba5c9f119a592562e7bb1a96629e08  hivex-1.2.6.tar.gz