Author: glen Date: Thu Feb 7 00:00:06 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge qemu 0.9.1 from AC-branch
---- Files affected:
SPECS:
qemu.spec (1.98 -> 1.99)
---- Diffs:
================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.98 SPECS/qemu.spec:1.99
--- SPECS/qemu.spec:1.98 Mon Jan 21 08:11:35 2008
+++ SPECS/qemu.spec Thu Feb 7 01:00:01 2008
@@ -14,28 +14,34 @@
%bcond_without kernel # build kqemu KERNEL MODULES
%bcond_without userspace # don't build userspace
%bcond_with grsec_kernel # build for kernel-grsecurity
-#
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+%if %{with dist_kernel} && %{with grsec_kernel}
%define alt_kernel grsecurity
%endif
+
+# no kernel kqemu module for ppc
+%ifarch ppc
+%undefine with_kqemu
+%undefine with_kernel
+%endif
+
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-# no kqemu for ppc
-%ifarch ppc
-%undefine with_kqemu
-%undefine with_kernel
-%endif
%define kqemu_version 1.3.0pre11
-%define qemu_version 0.9.0
-%define _rel 60
+%define qemu_version 0.9.1
%define pname qemu
+
+%define rel 4
Summary: QEMU CPU Emulator
Summary(pl.UTF-8): QEMU - emulator procesora
Name: %{pname}%{_alt_kernel}
Version: %{qemu_version}
-Release: %{_rel}%{?with_kqemu:k}
+Release: %{rel}%{?with_kqemu:k}
License: GPL
Group: Applications/Emulators
#Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
@@ -72,7 +78,7 @@
%endif
Requires: SDL >= 1.2.1
# sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c)
-ExclusiveArch: %{ix86} %{x8664} ppc
+ExclusiveArch: %{ix86} %{x8664} %{?with_userspace:ppc}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# some SPARC boot image in ELF format
@@ -113,7 +119,7 @@
Summary: kqemu - kernel module
Summary(pl.UTF-8): kqemu - moduł jądra
Version: %{kqemu_version}
-Release: [EMAIL PROTECTED]
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel}
License: GPL v2
@@ -293,6 +299,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2008-02-07 00:00:01 glen
+- merge qemu 0.9.1 from AC-branch
+
Revision 1.98 2008-01-21 07:11:35 wolvverine
- rel.60 for 2.6.22.16-4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.98&r2=1.99&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
