[Ovirt-devel] [PATCH appliance] Fix packaging for appliance due to change in appliance-tools default behavior

[Perry Myers]

appliance-tools used to put disk images directly in $PWD but now they get
put in a subdir with the same name as the appliance.  Need to adjust
the script in %build to account for this as well as make the current
version of appliance-tools the minimum version required since the
api between versions changed.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt-appliance.spec.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index ce9a4d4..f84d5e6 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -16,7 +16,8 @@ License: GPLv2+
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL: http://ovirt.org/
-BuildRequires: appliance-tools appliance-os
+BuildRequires: appliance-tools >= 002-5
+BuildRequires: appliance-os
 BuildRequires: livecd-tools >= 017
 BuildRequires: syslinux
 BuildRequires: qemu-img
@@ -87,7 +88,7 @@ sudo su - -c "cd $(pwd) && appliance-creator --config ovirt-appliance.ks \
                   --tmpdir='%{ovirt_cache_dir}/appliance-tmp' \
                   --cache='%{ovirt_cache_dir}/yum'"
 sudo su - -c "cd $(pwd) && chown -R $USER ."
-mv %{name}-sda.qcow2 %{name}.img
+mv %{name}/%{name}-sda.qcow2 %{name}.img
 
 %install
 %{__rm} -rf %{buildroot}
-- 
1.6.0.3