From ea772b42cc6db27334bc40ef924ba0d6b0b25d449f724dce0a8f87d2e8a58c7a Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 19 May 2010 17:38:53 +0000
Subject: [PATCH] - co-exist with virt-utils, which provides some qemu
 components   (bnc#586115)

OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=5
---
 qemu.changes | 6 ++++++
 qemu.spec    | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/qemu.changes b/qemu.changes
index e72739e..1ce7826 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 19 17:37:03 UTC 2010 - brogers@novell.com
+
+- co-exist with virt-utils, which provides some qemu components
+  (bnc#586115)
+
 -------------------------------------------------------------------
 Sun Apr 18 01:34:46 UTC 2010 - crrodriguez@opensuse.org
 
diff --git a/qemu.spec b/qemu.spec
index c96463b..18870a0 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -25,7 +25,7 @@ License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar
 Group:          System/Emulators/PC
 Summary:        Universal CPU emulator
 Version:        0.11.0
-Release:        5
+Release:        6
 Source:         %name-0.11.0.tar.bz2
 Patch1:         0001-qemu-0.7.0-amd64.patch
 Patch2:         0002-qemu-0.9.0.cvs-binfmt.patch
@@ -64,7 +64,7 @@ Patch33:        0033-dup3-check-fallocate-check-fixed.patch
 Source300:      rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 ppc sparc %arm x86_64 s390x
-Requires:       timezone
+Requires:       timezone virt-utils
 
 %description
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -136,7 +136,7 @@ echo "CURL_LIBS=-lcurl" >> config-host.mak
 echo "#define CONFIG_CURL 1" >> config-host.h
 make %{?jobs:-j%{jobs}} V=1
 make qemu-img V=1
-mv */qemu */qemu-* qemu-img qemu-nbd qemu-io dynamic || true
+mv */qemu */qemu-* qemu-io dynamic || true
 make clean
 # build userland emus
 ./configure --prefix=/usr \
@@ -149,6 +149,8 @@ make %{?jobs:-j%{jobs}} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/usr/share/man/man1/qemu-img.1
+rm -f $RPM_BUILD_ROOT/usr/share/man/man8/qemu-nbd.8
 rm -fr $RPM_BUILD_ROOT/usr/share/doc
 install -m 755 */qemu $RPM_BUILD_ROOT/usr/bin
 ln -sf qemu $RPM_BUILD_ROOT/usr/bin/qemu-system-i386