Author: arvenil Date: Sun Dec 30 22:23:35 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- better way to package kvm
- R: qemu
---- Files affected:
SPECS:
kvm.spec (1.18 -> 1.19)
---- Diffs:
================================================================
Index: SPECS/kvm.spec
diff -u SPECS/kvm.spec:1.18 SPECS/kvm.spec:1.19
--- SPECS/kvm.spec:1.18 Sat Dec 15 11:39:10 2007
+++ SPECS/kvm.spec Sun Dec 30 23:23:29 2007
@@ -7,7 +7,7 @@
%define no_install_post_strip 1
-%define _rel 0.1
+%define _rel 0.2
Summary: Kernel-based Virtual Machine for Linux
Summary(pl.UTF-8): Oparta na jądrze maszyna wirtualna dla Linuksa
@@ -27,9 +27,8 @@
%if %{with userspace}
BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel
-BuildRequires: libuuid-devel
-BuildRequires: perl-tools-pod
BuildRequires: zlib-devel
+Requires: qemu
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,17 +76,13 @@
%{!?with_kernel:--with-patched-kernel} \
--disable-gcc-check \
--kerneldir=%{_kernelsrcdir} \
- --prefix=%{_libdir}/kvm \
+ --prefix=%{_prefix} \
--kerneldir=$PWD/kernel \
--disable-gcc-check \
--enable-alsa \
--qemu-cc="%{__cc}"
%if %{with userspace}
-# build bios or use binary one?
-#%{__make} bios
-%{__make} libkvm
-%{__make} user
%{__make} qemu
%endif
@@ -99,11 +94,15 @@
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
-%{__make} -C libkvm install \
- DESTDIR=$RPM_BUILD_ROOT
-# KERNELDIR=%{_kernelsrcdir}
%{__make} -C qemu install \
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
+
+# changing binary name to avoid conflict with qemu
+mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64
$RPM_BUILD_ROOT%{_bindir}/%{name}
%endif
%if %{with kernel}
@@ -122,14 +121,7 @@
%if %{with userspace}
%files
%defattr(644,root,root,755)
-%dir %{_libdir}/kvm
-%dir %{_libdir}/kvm/bin
-%attr(755,root,root) %{_libdir}/kvm/bin/*
-%{_libdir}/kvm/include
-%{_libdir}/kvm/%{_lib}
-%dir %{_libdir}/kvm/share
-%{_libdir}/kvm/share/qemu
-%{_mandir}/man1/qemu*.1*
+%attr(755,root,root) %{_bindir}/%{name}
%endif
%if %{with kernel}
@@ -144,6 +136,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2007-12-30 22:23:29 arvenil
+- better way to package kvm
+- R: qemu
+
Revision 1.18 2007-12-15 10:39:10 arvenil
- reverted remove BR: alsa-lib-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kvm.spec?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
