[libguestfs] New upstream version 1.13.22.

[Richard W.M. Jones]

commit 1a7ac3f9c87fb18e2222088e15b87eec21e19b4a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Oct 19 18:02:01 2011 +0100

    New upstream version 1.13.22.
    
    - Remove 3x upstream patches.
    - Renumber the two remaining non-upstream patches as patch0, patch1.

 .gitignore                                         |    1 +
 ...ount-and-virt-sysprep-tests-if-no-dev-fus.patch |   45 ---------------
 ...edora-cryptsetup-luks-renamed-to-cryptset.patch |   27 ---------
 ...p-Fix-test-to-use-guestmount-and-virt-ins.patch |   58 --------------------
 libguestfs.spec                                    |   29 ++++------
 sources                                            |    2 +-
 6 files changed, 13 insertions(+), 149 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2a1d66..bd07700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,3 +108,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.13.19.tar.gz
 /libguestfs-1.13.20.tar.gz
 /libguestfs-1.13.21.tar.gz
+/libguestfs-1.13.22.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index f859424..7f2cb77 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.13.21
-Release:       4%{?dist}
+Version:       1.13.22
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -38,22 +38,13 @@ Source0:       http://libguestfs.org/download/1.13-development/%{name}-%{version
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # Force qemu-kvm test to run with -machine accel=tcg flag.
-Patch2:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
+Patch0:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
 
 # Non-upstream patch to fix -machine option.  This is not upstream
 # because qemu have reverted the behaviour.  However the reverted
 # version is not yet in Rawhide so we have to keep this patch for a
 # while.
-Patch3:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
-
-# Upstream patch to rename cryptsetup-luks to cryptsetup.
-Patch4:        0001-appliance-Fedora-cryptsetup-luks-renamed-to-cryptset.patch
-
-# Upstream patch to fix virt-sysprep test.
-Patch5:        0001-virt-sysprep-Fix-test-to-use-guestmount-and-virt-ins.patch
-
-# Upstream patch to skip FUSE tests if no /dev/fuse.
-Patch6:        0001-Skip-guestmount-and-virt-sysprep-tests-if-no-dev-fus.patch
+Patch1:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -528,11 +519,8 @@ for %{name}.
 %prep
 %setup -q
 
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -909,6 +897,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 19 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.22-1
+- New upstream version 1.13.22.
+- Remove 3x upstream patches.
+- Renumber the two remaining non-upstream patches as patch0, patch1.
+
 * Mon Oct 17 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.21-4
 - Add upstream patch to skip FUSE tests if there is no /dev/fuse.
   This allows us also to remove the Fedora-specific patch which
diff --git a/sources b/sources
index 38a9e1b..c7603f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b16824fc6a40a718299a498e4ead6e  libguestfs-1.13.21.tar.gz
+745217ec6046d483b5b610506252ff45  libguestfs-1.13.22.tar.gz