rpms/kvm/devel kvm.spec,1.80,1.81

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12625

Modified Files:
	kvm.spec 
Log Message:
Explicitly install newly built BIOS blobs (rhbz #478855)


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kvm.spec	22 Dec 2008 16:55:46 -0000	1.80
+++ kvm.spec	6 Jan 2009 16:58:22 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 81
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -63,8 +63,13 @@
 
 # we need to install the data bits in a different path
 sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
-./configure --with-patched-kernel --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags=$qemuldflags \
---audio-drv-list=oss,alsa --disable-blobs
+./configure \
+   --with-patched-kernel \
+   --kerneldir=$(pwd)/kernel \
+   --prefix=%{_prefix} \
+   --qemu-ldflags=$qemuldflags \
+   --disable-blobs \
+   --audio-drv-list=oss,alsa
 
 # build the bios, and fix it's makefile
 sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -95,10 +100,11 @@
 # make install gives it bogus execute permissiions
 chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1*
 
-# We're only build x86, so kill other BIOS to save disk space
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/openbios-sparc32
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ppc_rom.bin
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/video.x
+install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
+for i in bios.bin extboot.bin vgabios.bin vgabios-cirrus.bin
+do
+  install -m 0644 qemu/pc-bios/$i $RPM_BUILD_ROOT/%{_datadir}/%{name}/$i
+done
 
 mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
 
@@ -132,13 +138,37 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_mandir}/*
-%{_datadir}/%{name}
+%{_bindir}/kvmtrace
+%{_bindir}/kvmtrace_format
+%{_bindir}/qemu-kvm
+%{_bindir}/qemu-nbd
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/keymaps
+%{_datadir}/%{name}/keymaps/*
+
+%{_datadir}/%{name}/bios.bin
+%{_datadir}/%{name}/extboot.bin
+%{_datadir}/%{name}/pxe-e1000.bin
+%{_datadir}/%{name}/pxe-ne2k_pci.bin
+%{_datadir}/%{name}/pxe-pcnet.bin
+%{_datadir}/%{name}/pxe-rtl8139.bin
+%{_datadir}/%{name}/pxe-virtio.bin
+%{_datadir}/%{name}/vgabios-cirrus.bin
+%{_datadir}/%{name}/vgabios.bin
+
+%{_mandir}/man1/qemu-kvm.1*
+%{_mandir}/man8/qemu-nbd.8*
+
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 
 %changelog
+* Tue Jan  6 2009 Daniel P. Berrange <berrange at redhat.com> - 81-2
+- Explicitly install newly built BIOS blobs (rhbz #478855)
+- List all files explicitly so they don't silently go missing
+- Don't claim ownership of the shared man page directories
+
 * Mon Dec 22 2008 Glauber Costa <glommer at redhat.com> - 81-1
 - Updated to kvm-81.
 - kvm-fix-pc-bios-make-install-missing-files.patch not needed anymore