SPECS: kvm.spec - don't require external qemu, doesn't make sense.

[blues]

Author: blues                        Date: Tue Jul  8 21:41:38 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't require external qemu, doesn't make sense.

---- Files affected:
SPECS:
   kvm.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/kvm.spec
diff -u SPECS/kvm.spec:1.40 SPECS/kvm.spec:1.41
--- SPECS/kvm.spec:1.40	Tue Jun 24 13:26:41 2008
+++ SPECS/kvm.spec	Tue Jul  8 23:41:32 2008
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - udev is optional, so separate udev stuff from kernel module
 # - doesn't build on ppc, fix this if possible
 #
 # Conditional build:
@@ -40,12 +39,15 @@
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	zlib-devel
-Requires:	qemu
+Conflicts:	qemu
 %endif
 # ppc broken?
 ExclusiveArch:	%{ix86} %{x8664} ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# some SPARC boot image in ELF format
+%define         _noautostrip    .*%{_datadir}/qemu/openbios-sparc32
+
 %description
 KVM (for Kernel-based Virtual Machine) is a full virtualization
 solution for Linux on x86 hardware. It consists of a loadable kernel
@@ -129,8 +131,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # 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
 
 # changing binary name to avoid conflict with qemu
 mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT%{_bindir}/%{pname}
@@ -161,7 +163,10 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kvm*
+%attr(755,root,root) %{_bindir}/*
+%{_datadir}/qemu
+%{_mandir}/man1/qemu.1*
+%{_mandir}/man1/qemu-img.1*
 
 %files udev
 %defattr(644,root,root,755)
@@ -180,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2008/07/08 21:41:32  blues
+- don't require external qemu, doesn't make sense.
+
 Revision 1.40  2008/06/24 11:26:41  arekm
 - release 4
 
================================================================

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