From f45bf28138ed5d3feefeeb47da6894514de5554c Mon Sep 17 00:00:00 2001
From: riel <riel@fedoraproject.org>
Date: May 20 2005 19:10:14 +0000
Subject: qemu device model for VMX


---

diff --git a/.cvsignore b/.cvsignore
index 26f5225..0d27de7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
+qemu-ioemu.tar.gz
 xen-unstable-src.tgz
diff --git a/sources b/sources
index 08c4568..1c08434 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+70b068b4585e01e9fbd86d57e44f7e8f  qemu-ioemu.tar.gz
 425a87af78cc9ec01b04095c99bd0c90  xen-unstable-src.tgz
diff --git a/xen.spec b/xen.spec
index 5d8ee98..b358c40 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,15 +3,17 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 2
-Release: 20050519
+Release: 20050520
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 Source0: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-unstable-src.tgz
+Source1: qemu-ioemu.tar.gz
 Patch0: xen-misc-fixes.patch
 Patch1: xen-vmxfixes.patch
+Patch2: xen-qemu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: transfig libidn-devel zlib-devel
+BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel
 BuildRequires: xorg-x11-devel python-devel ghostscript tetex-latex
 Requires: bridge-utils python-twisted
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -33,17 +35,22 @@ or makes fun of you in front of your friends.
 
 %prep
 %setup -q -n xen-unstable
+%{__rm} -rf tools/ioemu
+%{__tar} xz --strip-components=1 -f %{SOURCE1}
+%{__chmod} -R u+w tools/ioemu
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 xen tools docs 
+CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} xen tools docs 
 
 %install
 rm -rf %{buildroot}
-make XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} install-xen install-tools
+make XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-xen install-tools
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet
+rm -rf %{buildroot}%{_datadir}/doc/qemu
 
 ### fixing start-script dir
 mkdir -p %{buildroot}/etc/rc.d
@@ -57,9 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING ChangeLog README
 %doc docs/pdf/
 %doc docs/misc/
+%doc tools/ioemu/*.html
 /boot/%{name}-syms
 /boot/%{name}.gz
-%{_sbindir}/device-model
 %{_sbindir}/netfix
 %{_sbindir}/xcs
 %{_sbindir}/xcsdump
@@ -68,6 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/xfrd
 %{_sbindir}/xm
 %{_sbindir}/xenperf
+%{_bindir}/device-model
+%{_bindir}/qemu-dm
 %{_bindir}/xenperf
 %{_bindir}/xencons
 %{_bindir}/xentrace
@@ -86,11 +95,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*.?.gz
 %dir %{_localstatedir}/lib/%{name}
 %{_localstatedir}/lib/%{name}/*
+%{_datadir}/qemu/*
 %{_sysconfdir}/rc.d/init.d/xend
 %{_sysconfdir}/rc.d/init.d/xendomains
 %{_sysconfdir}/%{name}*
 
 %changelog
+* Fri May 20 2005 Rik van Riel <riel@redhat.com> 2-20050520
+- qemu device model for VMX
+
 * Thu May 19 2005 Rik van Riel <riel@redhat.com> 2-20050519
 - apply some VMX related bugfixes