SPECS: kvm.spec - up to 72; HEAD is for kvm from official th kernels

[arekm]

Author: arekm                        Date: Tue Aug  5 10:19:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 72; HEAD is for kvm from official th kernels

---- Files affected:
SPECS:
   kvm.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/kvm.spec
diff -u SPECS/kvm.spec:1.43 SPECS/kvm.spec:1.44
--- SPECS/kvm.spec:1.43	Mon Jul 28 10:41:58 2008
+++ SPECS/kvm.spec	Tue Aug  5 12:19:05 2008
@@ -4,8 +4,10 @@
 #
 # Conditional build:
 %bcond_without  dist_kernel     	# allow non-distribution kernel
-%bcond_without  kernel                  # build for unpatched kernel (which doesn't provide kvm.ko already)
+%bcond_with	kernel                  # build for unpatched kernel (which doesn't provide kvm.ko already)
 %bcond_without  userspace               # don't build userspace utilities
+%bcond_with	verbose
+%bcond_with	internal_qemu
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -18,17 +20,17 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	4
+%define		rel	1
 %define		pname	kvm
 Summary:	Kernel-based Virtual Machine for Linux
 Summary(pl.UTF-8):	Oparta na jądrze maszyna wirtualna dla Linuksa
 Name:		%{pname}%{_alt_kernel}
-Version:	60
+Version:	72
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/kvm/%{pname}-%{version}.tar.gz
-# Source0-md5:	79d92d57ad3b6057a717b25bb20ee72c
+# Source0-md5:	e4f99d05dee168200695850165cd760e
 URL:		http://kvm.sourceforge.net/
 BuildRequires:	bash
 %if %{with kernel}
@@ -39,7 +41,11 @@
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	zlib-devel
+%if %{with internal_qemu}
 Conflicts:	qemu
+%else
+Requires:	qemu
+%endif
 %endif
 # ppc broken?
 ExclusiveArch:	%{ix86} %{x8664} ia64
@@ -103,20 +109,15 @@
 # not ac stuff
 ./configure \
 	%{!?with_kernel:--with-patched-kernel} \
+	%{!?with_userspace:--disable-sdl} \
 	--disable-gcc-check \
-	--kerneldir=%{_kernelsrcdir} \
+	--disable-werror \
 	--prefix=%{_prefix} \
-	--kerneldir=$PWD/kernel \
-%if %{with userspace}
-	--enable-alsa \
-%else
-	--disable-gfx-check \
-	--disable-sdl \
-%endif
-	--qemu-cc="%{__cc}"
+	--kerneldir=$PWD/kernel
 
 %if %{with userspace}
-%{__make} qemu
+%{__make} qemu \
+	CC="%{__cc}"
 %endif
 
 %if %{with kernel}
@@ -130,9 +131,11 @@
 %{__make} -C qemu install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if ! %{with internal_qemu}
 # removing files which are provided by required qemu package
-#rm -rf $RPM_BUILD_ROOT%{_datadir}/qemu $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT%{_docdir}
-#rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-img
+rm -rf $RPM_BUILD_ROOT%{_datadir}/qemu $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT%{_docdir}
+rm -f $RPM_BUILD_ROOT%{_bindir}/qemu-img
+%endif
 
 # changing binary name to avoid conflict with qemu
 mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT%{_bindir}/%{pname}
@@ -164,9 +167,12 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/qemu-nbd
+%if %{with internal_qemu}
 %{_datadir}/qemu
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/qemu-img.1*
+%endif
 
 %files udev
 %defattr(644,root,root,755)
@@ -185,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2008/08/05 10:19:05  arekm
+- up to 72; HEAD is for kvm from official th kernels
+
 Revision 1.43  2008/07/28 08:41:58  beorn
 - reverted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kvm.spec?r1=1.43&r2=1.44&f=u