From 03caed6eaa04f19ec9c5ef054d62a986640d7fd7 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Mar 21 2012 14:43:09 +0000
Subject: New upstream version 1.17.21.


(cherry picked from commit 9889d53bce8bf3b2f0c435517634329b306b7772
and commit 48159fccdc5f39694a2c5039e586fbd5fee53bc4
and commit 7370ddcaf4a39234eb899c1e723b5c7e50ff124f
and commit 9596dea44f82ee4d798364e7ef2a9f4b9ba04888)

---

diff --git a/.gitignore b/.gitignore
index 31d0138..a7aab61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,3 +153,5 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.17.17.tar.gz
 /libguestfs-1.17.18.tar.gz
 /libguestfs-1.17.19.tar.gz
+/libguestfs-1.17.20.tar.gz
+/libguestfs-1.17.21.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 42db41f..a313844 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -21,7 +21,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.17.19
+Version:       1.17.21
 Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
@@ -316,6 +316,10 @@ Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      pkgconfig
 
+# For libguestfs-make-fixed-appliance.
+Requires:      xz
+Requires:      libguestfs-tools-c
+
 
 %description devel
 %{name}-devel contains development tools and libraries
@@ -866,7 +870,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/*.c
 %doc installed-docs/*
 %{_libdir}/libguestfs.so
+%{_sbindir}/libguestfs-make-fixed-appliance
 %{_mandir}/man1/guestfs-recipes.1*
+%{_mandir}/man1/libguestfs-make-fixed-appliance.1*
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/guestfs-examples.3*
 %{_mandir}/man3/libguestfs.3*
@@ -1053,6 +1059,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 21 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.21-1
+- New upstream version 1.17.21.
+- Add libguestfs-make-fixed-appliance (with man page).
+
 * Fri Mar 16 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.19-1
 - New upstream version 1.17.19.
 
diff --git a/sources b/sources
index e53a639..43a7ca4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f717650aaa5ebe1dc76b945e770c6a26  libguestfs-1.17.19.tar.gz
+0b6e4d93c4e4945f80357444528a6082  libguestfs-1.17.21.tar.gz