rpms/kvm/devel .cvsignore, 1.23, 1.24 kvm.spec, 1.37, 1.38 sources, 1.23, 1.24 kvm-58-defaults.patch, 1.1, NONE kvm-fix-bios.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

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

Modified Files:
	.cvsignore kvm.spec sources 
Removed Files:
	kvm-58-defaults.patch kvm-fix-bios.patch 
Log Message:
Update to kvm-60. Remove non-x86 BIOS files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	16 Jan 2008 04:07:00 -0000	1.23
+++ .cvsignore	25 Jan 2008 01:47:26 -0000	1.24
@@ -1 +1 @@
-kvm-59.tar.gz
+kvm-60.tar.gz


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kvm.spec	16 Jan 2008 04:07:00 -0000	1.37
+++ kvm.spec	25 Jan 2008 01:47:26 -0000	1.38
@@ -1,25 +1,23 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 59
+Version: 60
 Release: 1%{?dist}
-License: GPLv2+, LGPLv2+
+License: GPLv2+ and LGPLv2+
 Group: Development/Tools
-URL: http://kvm.sf.net
-Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
-Source1: kvm.modules
-Patch0: kvm-58-defaults.patch
-Patch1: kvm-bootmenu.patch
-Patch2: kvm-fix-bios.patch
+URL: http://%{name}.sf.net
+Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source1: %{name}.modules
+Patch1: %{name}-bootmenu.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel 
+BuildRequires: SDL-devel
 # to build the bios
 BuildRequires: dev86
 BuildRequires: iasl
 BuildRequires: %{_includedir}/gnu/stubs-32.h
 # qemu doesn't build with gcc 4.x
-BuildRequires: compat-gcc-34 
-BuildRequires: zlib-devel 
+BuildRequires: compat-gcc-34
+BuildRequires: zlib-devel
 BuildRequires: e2fsprogs-devel
 # TLS / x509 auth in VNC server
 BuildRequires: gnutls-devel
@@ -30,18 +28,16 @@
 Requires: initscripts >= 8.08-1
 
 %description
-KVM (for Kernel-based Virtual Machine) is a full virtualization solution 
-for Linux on x86 hardware. 
+KVM (for Kernel-based Virtual Machine) is a full virtualization solution
+for Linux on x86 hardware.
 
-Using KVM, one can run multiple virtual machines running unmodified Linux 
-or Windows images. Each virtual machine has private virtualized hardware: 
+Using KVM, one can run multiple virtual machines running unmodified Linux
+or Windows images. Each virtual machine has private virtualized hardware:
 a network card, disk, graphics adapter, etc.
 
 %prep
 %setup -q
-%patch0 -p1 -b .defaults
 %patch1 -p1
-%patch2 -p1
 
 %build
 # we need to install the data bits in a different path
@@ -53,7 +49,7 @@
 # manual keeping up of what is in the kvm tree.
 sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 # build the bios, and fix it's makefile
 sed -i 's/gcc -m32/gcc/' bios/Makefile
@@ -71,6 +67,14 @@
 # no shared lib, static libs
 rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir}
 
+# 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
+
 mv $RPM_BUILD_ROOT/%{_bindir}/qemu* $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
@@ -83,11 +87,16 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/qemu-kvm
-%{_mandir}/man*/*
-%{_datadir}/kvm
-%{_sysconfdir}/sysconfig/modules/kvm.modules
+%{_mandir}/man1/qemu-kvm.1*
+%{_datadir}/%{name}
+%{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Thu Jan 24 2008 Daniel P. Berrange <berrange at redhat.com> - 60-1.fc9
+- Updated to kvm-60
+- Fix license tag to keep rpmlint quiet
+- Remove unused PPC, Sparc and PPC Video BIOS
+
 * Tue Jan 15 2008 Bill Nottingham <notting at redhat.com>: - 59-1
 - add upstream patch to fix VMs that no longer boot (#427317)
 - update to kvm-59


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	16 Jan 2008 04:07:00 -0000	1.23
+++ sources	25 Jan 2008 01:47:26 -0000	1.24
@@ -1 +1 @@
-59fc43ab950c003a94004e08806ee675  kvm-59.tar.gz
+79d92d57ad3b6057a717b25bb20ee72c  kvm-60.tar.gz


--- kvm-58-defaults.patch DELETED ---


--- kvm-fix-bios.patch DELETED ---