rpms/kvm/F-9 kvm.spec,1.61,1.61.2.1

[Juan Quintela]

Author: quintela

Update of /cvs/pkgs/rpms/kvm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28546

Modified Files:
      Tag: private-quintela-kvm-77-branch
	kvm.spec 
Log Message:

- update to rawhide one.
- Updated to kvm-77.


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-9/kvm.spec,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -u -r1.61 -r1.61.2.1
--- kvm.spec	13 Oct 2008 16:45:32 -0000	1.61
+++ kvm.spec	21 Oct 2008 16:26:59 -0000	1.61.2.1
@@ -1,38 +1,26 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 65
-Release: 10%{?dist}
+Version: 77
+Release: 0.1kvm%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
 Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Source1: %{name}.modules
-Patch0: kvm-63-defaults.patch
-Patch1: %{name}-bootmenu.patch
-Patch2: %{name}-62-block-rw-range-check.patch
-Patch3: %{name}-62-e1000-default.patch
-Patch4: %{name}-65-kernel-virtio-boot.patch
-Patch5: %{name}-65-cirrus.patch
-Patch6: %{name}-65-pty-rawmode.patch
-Patch7: %{name}-cirrus-bitblt-overflow.patch
-Patch8: %{name}-extboot.patch
-Patch9: %{name}-acpi-do-not-wrap.patch
-Patch10: %{name}-acpi-do-not-ovflw.patch
-Patch11: %{name}-sysenter32.patch
+Patch1: %{name}-62-block-rw-range-check.patch
+
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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
 # TLS / x509 auth in VNC server
 BuildRequires: gnutls-devel
 # for the docs
 BuildRequires: texi2html
+BuildRequires: rsync
 # kvm kernel side is only x86/x86_64 as that's where the hardware is
 ExclusiveArch: %{ix86} x86_64
 Requires: initscripts >= 8.08-1
@@ -47,23 +35,28 @@
 
 %prep
 %setup -q
-#patch0 -p1
 %patch1 -p1
-%patch2 -p1
-#patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
+
+# systems like rhel build system does not have a recent enough linker so 
+# --build-id works. this option is used fedora 8 onwards for giving info
+# to the debug packages.
+
+build_id_available() {
+	echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
+}
+
+if build_id_available; then
+	qemuldflags="-Wl,--build-id";
+else
+	qemuldflags="";
+fi
+
 # 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 --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
+./configure --with-patched-kernel --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags=$qemuldflags \
+--audio-drv-list=oss,alsa
 
 # we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
 # qemu bits.  so let's set it for the other pieces.  this requires some
@@ -96,7 +89,7 @@
 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
+mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
@@ -104,15 +97,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%{_bindir}/qemu-kvm
-%{_mandir}/man1/qemu-kvm.1*
+%{_bindir}/*
+%{_mandir}/*
 %{_datadir}/%{name}
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Tue Oct 21 2008 Juan Quintela <quintela at redhat.com> - 77-0.1kvm
+- update to rawhide one.
+- Updated to kvm-77.
+
 * Mon Oct 13 2008 Glauber Costa <gcosta at redhat.com> - 65-10.fc9
 - Fix sysenter save in 64-bit hosts #457649