[libguestfs] - New upstream version 1.13.21. - Move virt-sysprep to libguestfs-tools, to avoid pulling in extra

[Richard W.M. Jones]

commit aa8e60e20442ea25395681e70cbf7bc2d49538e9
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Oct 14 16:26:47 2011 +0100

    - New upstream version 1.13.21.
    - Move virt-sysprep to libguestfs-tools, to avoid pulling in extra
      dependencies for RHEV-H.  This tool is not likely to be useful
      for RHEV-H in its current form anyway.
    - Change BR cryptsetup-luks -> cryptsetup since that package changed.

 .gitignore      |    1 +
 libguestfs.spec |   26 ++++++++++++++++++++------
 sources         |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c1412c..c2a1d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.13.18.tar.gz
 /libguestfs-1.13.19.tar.gz
 /libguestfs-1.13.20.tar.gz
+/libguestfs-1.13.21.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index af8f200..388a28b 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.20
-Release:       1%{?dist}.1
+Version:       1.13.21
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -90,7 +90,7 @@ BuildRequires: hfsplus-tools, nilfs-utils, reiserfs-utils
 BuildRequires: jfsutils, xfsprogs
 BuildRequires: vim-minimal
 BuildRequires: binutils
-BuildRequires: cryptsetup-luks
+BuildRequires: cryptsetup
 BuildRequires: lzop
 %ifarch %{ix86} x86_64
 #BuildRequires: grub
@@ -107,7 +107,7 @@ Requires:      hfsplus-tools, nilfs-utils, reiserfs-utils
 Requires:      jfsutils, xfsprogs
 Requires:      vim-minimal
 Requires:      binutils
-Requires:      cryptsetup-luks
+Requires:      cryptsetup
 Requires:      lzop
 %ifarch %{ix86} x86_64
 #Requires:      grub
@@ -276,6 +276,13 @@ Requires:      perl(Win::Hivex) >= 1.2.7
 # for virt-make-fs:
 Requires:      qemu-img
 
+# for virt-sysprep:
+Requires:      /usr/bin/fusermount
+Requires:      /usr/bin/getopt
+Requires:      /usr/bin/guestmount
+Requires:      /usr/bin/virt-inspector
+Requires:      xmlstarlet
+
 
 %description tools
 This package contains miscellaneous system administrator command line
@@ -771,8 +778,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-resize.1*
 %{_bindir}/virt-sparsify
 %{_mandir}/man1/virt-sparsify.1*
-%{_bindir}/virt-sysprep
-%{_mandir}/man1/virt-sysprep.1*
 %{_bindir}/virt-tar-in
 %{_mandir}/man1/virt-tar-in.1*
 %{_bindir}/virt-tar-out
@@ -788,6 +793,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-list-partitions.1*
 %{_bindir}/virt-make-fs
 %{_mandir}/man1/virt-make-fs.1*
+%{_bindir}/virt-sysprep
+%{_mandir}/man1/virt-sysprep.1*
 %{_bindir}/virt-tar
 %{_mandir}/man1/virt-tar.1*
 %{_bindir}/virt-win-reg
@@ -893,6 +900,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 14 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.21-1
+- New upstream version 1.13.21.
+- Move virt-sysprep to libguestfs-tools, to avoid pulling in extra
+  dependencies for RHEV-H.  This tool is not likely to be useful
+  for RHEV-H in its current form anyway.
+- Change BR cryptsetup-luks -> cryptsetup since that package changed.
+
 * Wed Oct 12 2011 Peter Schiffer <pschiffe at redhat.com> - 1:1.13.20-1.1
 - rebuild with new gmp
 
diff --git a/sources b/sources
index 2cf6f92..38a9e1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1102e99393b43d70676913fc66cc7cc  libguestfs-1.13.20.tar.gz
+b7b16824fc6a40a718299a498e4ead6e  libguestfs-1.13.21.tar.gz