From a68995ba9ac39ce90d50f69e5448a11810d8cfc2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 29 Jan 2014 08:46:28 +0000
Subject: [PATCH] virt-make-fs has been rewritten in C.

- qemu-img is now required by the core library (for guestfs_disk_create).
- perl(String::ShellQuote) is no longer used.
---
 libguestfs.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index 243d993..9b49b51 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -75,7 +75,6 @@ BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Pod) >= 1.00
 BuildRequires: perl(Test::Pod::Coverage) >= 1.00
 BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(String::ShellQuote)
 BuildRequires: perl(Locale::TextDomain)
 BuildRequires: python-devel
 BuildRequires: ruby-devel
@@ -124,6 +123,9 @@ Requires:      libosinfo
 # For core mount-local (FUSE) API.
 Requires:      fuse
 
+# For core disk-create API.
+Requires:      /usr/bin/qemu-img
+
 # For libvirt backend.
 %ifarch %{ix86} x86_64
 Requires:      libvirt-daemon-kvm >= 0.10.2-3
@@ -237,9 +239,6 @@ Requires:      /usr/bin/less
 Requires:      /usr/bin/man
 Requires:      /usr/bin/vi
 
-# for virt-sparsify:
-Requires:      /usr/bin/qemu-img
-
 # for virt-builder:
 Requires:      curl
 Requires:      gnupg
@@ -269,9 +268,6 @@ Requires:      perl(String::ShellQuote)
 Requires:      perl(XML::Writer)
 Requires:      perl(Win::Hivex) >= 1.2.7
 
-# for virt-make-fs:
-Requires:      /usr/bin/qemu-img
-
 
 %description tools
 This package contains miscellaneous system administrator command line
@@ -829,6 +825,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 %{_mandir}/man1/virt-inspector.1*
 %{_bindir}/virt-ls
 %{_mandir}/man1/virt-ls.1*
+%{_bindir}/virt-make-fs
+%{_mandir}/man1/virt-make-fs.1*
 %{_bindir}/virt-rescue
 %{_mandir}/man1/virt-rescue.1*
 %{_bindir}/virt-resize
@@ -849,8 +847,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 %{_mandir}/man1/virt-list-filesystems.1*
 %{_bindir}/virt-list-partitions
 %{_mandir}/man1/virt-list-partitions.1*
-%{_bindir}/virt-make-fs
-%{_mandir}/man1/virt-make-fs.1*
 %{_bindir}/virt-tar
 %{_mandir}/man1/virt-tar.1*
 %{_bindir}/virt-win-reg
@@ -994,6 +990,11 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Wed Jan 29 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.31-2
+- virt-make-fs has been rewritten in C.
+- qemu-img is now required by the core library (for guestfs_disk_create).
+- perl(String::ShellQuote) is no longer used.
+
 * Wed Jan 29 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.31-1
 - New upstream version 1.25.31.