[Ovirt-devel] [PATCH ovirt-appliance] remove skip_compress_image

[Alan Pevec]

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 Makefile.am             |    2 --
 ovirt-appliance.spec.in |    6 +-----
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6631274..91f8fa3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,8 +38,6 @@ RPM_FLAGS	+= $(if $(OVIRT_URL),--define "ovirt_url $(OVIRT_URL)")
 # THINCRUST_URL env var can be set to the root of an thincrust.net mirror
 # FIXME: This is temporary until thincrust RPMS are in Fedora 9 Updates
 RPM_FLAGS	+= $(if $(THINCRUST_URL),--define "thincrust_url $(THINCRUST_URL)")
-# SKIP_COMPRESS_IMAGE env var an be set to 1 to skip qcow compression
-RPM_FLAGS	+= $(if $(SKIP_COMPRESS_IMAGE),--define "skip_compress_image $(SKIP_COMPRESS_IMAGE)")
 
 rpms: dist
 	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
diff --git a/ovirt-appliance.spec.in b/ovirt-appliance.spec.in
index fb19edd..f08e0f6 100644
--- a/ovirt-appliance.spec.in
+++ b/ovirt-appliance.spec.in
@@ -70,11 +70,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 ."
-if [ -n "%{?skip_compress_image}" ]; then
-   mv %{name}-sda.raw %{name}.img
-else
-   mv %{name}-sda.qcow2 %{name}.img
-fi
+mv %{name}-sda.qcow2 %{name}.img
 
 %install
 %{__rm} -rf %{buildroot}
-- 
1.5.5.1