[libguestfs] Version 1.15.4.

[Richard W.M. Jones]

commit 5106bf0c39d1c16250792fe7aba9ac75ddef3f0f
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Nov 17 15:01:27 2011 +0000

    Version 1.15.4.

 .gitignore                                 |    1 +
 0001-df-Disable-part-of-virt-df-test.patch |   41 ----------------------------
 libguestfs.spec                            |   13 ++++-----
 sources                                    |    2 +-
 4 files changed, 8 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9156191..2770440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.15.1.tar.gz
 /libguestfs-1.15.2.tar.gz
 /libguestfs-1.15.3.tar.gz
+/libguestfs-1.15.4.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 5c508d8..63d232e 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,8 +29,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.15.3
-Release:       3%{?dist}
+Version:       1.15.4
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -232,9 +232,6 @@ Source3:       99-guestfsd.rules
 # Replacement README file for Fedora users.
 Source4:       README-replacement.in
 
-# Upstream patch to disable part of virt-df test.
-Patch0:        0001-df-Disable-part-of-virt-df-test.patch
-
 
 %description
 Libguestfs is a library for accessing and modifying guest disk images.
@@ -585,8 +582,6 @@ for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
-
 mkdir -p daemon/m4
 
 # Replace developer-specific README that ships with libguestfs, with
@@ -962,6 +957,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 17 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.4-1
+- New upstream version 1.15.4.
+- Remove patch which is now upstream.
+
 * Fri Nov 11 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.3-3
 - Add upstream patch to disable part of virt-df test.
 
diff --git a/sources b/sources
index 485a086..441b193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53a3d3a3cf08141a4919e2423484535f  libguestfs-1.15.3.tar.gz
+7eb944f0efe5b5e7a04c40f58851793a  libguestfs-1.15.4.tar.gz