[libguestfs/f14/master] * Fri Oct 1 2010 Richard Jones <rjones at redhat.com> - 1:1.5.21-1 - New upstream development version

[Richard W.M. Jones]

commit 62f1e22b90558fab200b0c8edd4a13e30b9074b1
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Oct 1 21:11:39 2010 +0100

    * Fri Oct  1 2010 Richard Jones <rjones at redhat.com> - 1:1.5.21-1
    - New upstream development version 1.5.21.
    - Remove upstream patch.
    - Remove mock patch, since /dev/fd is supposed to exist now.

 .gitignore                                   |    1 +
 libguestfs-1.5.18-disable-test-copy.patch    |   54 --------------------------
 libguestfs-1.5.18-test-built-guestfish.patch |   42 --------------------
 libguestfs.spec                              |   17 +++-----
 sources                                      |    2 +-
 5 files changed, 9 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88f9c53..96e4f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libguestfs-1.5.2.tar.gz
 /libguestfs-1.5.16.tar.gz
 /libguestfs-1.5.17.tar.gz
 /libguestfs-1.5.18.tar.gz
+/libguestfs-1.5.21.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index b452c18..d62cda0 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.5.18
-Release:       1%{?dist}.2
+Version:       1.5.21
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,12 +52,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
-# Disable test-copy.sh because of missing /dev/fd bug in mock (RHBZ#526414).
-Patch1:        libguestfs-1.5.18-disable-test-copy.patch
-
-# Fix tests so they test the built guestfish (upstream).
-Patch2:        libguestfs-1.5.18-test-built-guestfish.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -417,8 +411,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -748,6 +740,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  1 2010 Richard Jones <rjones at redhat.com> - 1:1.5.21-1
+- New upstream development version 1.5.21.
+- Remove upstream patch.
+- Remove mock patch, since /dev/fd is supposed to exist now.
+
 * Wed Sep 22 2010 Richard Jones <rjones at redhat.com> - 1:1.5.18-1.fc14.2
 - Fix tests so they test the built guestfish, not /usr/bin/guestfish.
 
diff --git a/sources b/sources
index aadc40d..d6cb1c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-133728f7ce710c2a214283fc0fbbd42c  libguestfs-1.5.18.tar.gz
+549166bb9093cefc3e2c42452444bd2d  libguestfs-1.5.21.tar.gz