rpms/kvm/devel kvm.spec,1.4,1.5

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11637

Modified Files:
	kvm.spec 
Log Message:
* Mon Feb 19 2007 Jeremy Katz <katzj at redhat.com> - 12-2
- include bios and keymaps in the kvm package since we need a slightly 
  different version for kvm now
- include man page



Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kvm.spec	26 Jan 2007 20:54:30 -0000	1.4
+++ kvm.spec	19 Feb 2007 16:31:44 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 12
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://kvm.sf.net
@@ -15,7 +15,6 @@
 BuildRequires: e2fsprogs-devel
 # kvm kernel side is only x86/x86_64 as that's where the hardware is
 ExclusiveArch: %{ix86} x86_64
-Requires: qemu
 
 %description
 KVM (for Kernel-based Virtual Machine) is a full virtualization solution 
@@ -31,15 +30,19 @@
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
+# we need to install the data bits in a different path
+sed -i 's/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/qemu\"/CONFIG_QEMU_SHAREDIR \"\/usr\/share\/kvm\"/' qemu/config-host.h
+sed -i 's/datadir=\/usr\/share\/qemu/datadir=\/usr\/share\/kvm/' qemu/config-host.mak
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# we require qemu, so we can just use its keymaps, etc and not package them
-# ourself
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_docdir}
+# we have to have our own copies of the bios/keymaps due to incompat with
+# qemu 0.9.  include the man page
+mv $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.1* $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1
+rm -rf $RPM_BUILD_ROOT/%{_mandir}/man*/qemu-img* $RPM_BUILD_ROOT/%{_docdir}
 rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img
 # no shared lib, static libs
 rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir}
@@ -53,8 +56,15 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/qemu-kvm
+%{_mandir}/man*/*
+%{_datadir}/kvm
 
 %changelog
+* Mon Feb 19 2007 Jeremy Katz <katzj at redhat.com> - 12-2
+- include bios and keymaps in the kvm package since we need a slightly 
+  different version for kvm now
+- include man page
+
 * Fri Jan 26 2007 Jeremy Katz <katzj at redhat.com> - 12-1
 - update to kvm-12
 - add qemu patch for better ATAPI DMA support (which works with ata_piix)