rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 176291 from home:a_faerber:branches:Virtualization

Browse Source 
Update to v1.5.0 final and enable GTK+ frontend

OBS-URL: https://build.opensuse.org/request/show/176291
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=137
This commit is contained in:
Andreas Färber 2013-05-21 17:08:29 +00:00 committed by Git OBS Bridge
parent 5b81140006
commit 593480cfe1
44 changed files with 128 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-XXX-dont-dump-core-on-sigabort.patc.patch
View File

@ -1,4 +1,4 @@
From 681803d344ac4e81e5391b3f8e80d07158989376 Mon Sep 17 00:00:00 2001
From 13dfb466d30258e7a8e1657d9be88c8270e299fc Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 21 Nov 2011 23:50:36 +0100
Subject: [PATCH] XXX dont dump core on sigabort

2
0002-XXX-work-around-SA_RESTART-race-wit.patch
View File

@ -1,4 +1,4 @@
From f719775e8702d51f7ee986db8327aeeaeef42adb Mon Sep 17 00:00:00 2001
From 7a858eca9a75c39cf33a8f259db541ae295132f7 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 1 Dec 2011 19:00:01 +0100
Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)

2
0003-qemu-0.9.0.cvs-binfmt.patch.patch
View File

@ -1,4 +1,4 @@
From ad52f39fcbf752a0876078c307c0b675184dc826 Mon Sep 17 00:00:00 2001
From b8c97a30f3ae2c1a1c8fb27071938f5126ef5511 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH] qemu-0.9.0.cvs-binfmt

2
0004-qemu-cvs-alsa_bitfield.patch.patch
View File

@ -1,4 +1,4 @@
From 6957c48e055251fcf9d0a13795d647a0922a17de Mon Sep 17 00:00:00 2001
From 94fa57b0b5a784afdb81243ca42c2ceb56b07891 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH] qemu-cvs-alsa_bitfield

2
0005-qemu-cvs-alsa_ioctl.patch.patch
View File

@ -1,4 +1,4 @@
From f31461e8d761295ced956db11ecd658297f64625 Mon Sep 17 00:00:00 2001
From d0759bf94abea6a8f4bb307269f53de63c86f51a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:23:27 +0200
Subject: [PATCH] qemu-cvs-alsa_ioctl

2
0006-qemu-cvs-alsa_mmap.patch.patch
View File

@ -1,4 +1,4 @@
From accae82e0aad0021e8db2a450917e256fab85d5f Mon Sep 17 00:00:00 2001
From 4ab598c475bad5e975ee84dfe0a61cfd87b4b41a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH] qemu-cvs-alsa_mmap

2
0007-qemu-cvs-gettimeofday.patch.patch
View File

@ -1,4 +1,4 @@
From 0a366ce5d8cb1fe160becdede4420fc4a73417ed Mon Sep 17 00:00:00 2001
From 1bd4e865038ce8b6baedee0bfef0921d81731804 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH] qemu-cvs-gettimeofday

2
0008-qemu-cvs-ioctl_debug.patch.patch
View File

@ -1,4 +1,4 @@
From aff3bcca70eeb57bc2ba60230faca8e2e82dd341 Mon Sep 17 00:00:00 2001
From 06cafbff311739237aac8e18505d0d9713048eb1 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH] qemu-cvs-ioctl_debug

2
0009-qemu-cvs-ioctl_nodirection.patch.patch
View File

@ -1,4 +1,4 @@
From f8662cd8fc550199601d242cf019cdcc360ebc53 Mon Sep 17 00:00:00 2001
From e33833ca5e418416c4ba1fdb84a11a5c1d39992b Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH] qemu-cvs-ioctl_nodirection

2
0010-block-vmdk-Support-creation-of-SCSI.patch
View File

@ -1,4 +1,4 @@
From 8f2e9d5b9f0281b042d71861b6f4f477f070306f Mon Sep 17 00:00:00 2001
From 1931e39b450242d402e779204aaf832ab5bb98a5 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img

2
0011-linux-user-add-binfmt-wrapper-for-a.patch
View File

@ -1,4 +1,4 @@
From 95bce4fac86bb09d910d58a18446b003a4dd6e69 Mon Sep 17 00:00:00 2001
From 42b99c285cb5d260a3bfcf505ac2e2392bfda203 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling

2
0012-linux-user-Ignore-timer_create-sysc.patch
View File

@ -1,4 +1,4 @@
From e007889391a0d3d47627b7282a50ccaeb3be7ee2 Mon Sep 17 00:00:00 2001
From fc313ec8af695db139b22e315470dc52f0384459 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sun, 11 Dec 2011 01:19:24 +0100
Subject: [PATCH] linux-user: Ignore timer_create syscall

2
0013-linux-user-be-silent-about-capget-f.patch
View File

@ -1,4 +1,4 @@
From f32b84b6f245500bd66087370314f2f69f9d328d Mon Sep 17 00:00:00 2001
From 57a183ec5bff1c3de46b5ade272fca4a5868d7b4 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sun, 11 Dec 2011 01:21:51 +0100
Subject: [PATCH] linux-user: be silent about capget failures

2
0014-PPC-KVM-Disable-mmu-notifier-check..patch
View File

@ -1,4 +1,4 @@
From 35cc232beb6f11fe0e4994cd9fea0386e8e10e92 Mon Sep 17 00:00:00 2001
From 437147c88e0ef65c41d0d661827edfa0e351a26c Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 6 Jan 2012 01:05:55 +0100
Subject: [PATCH] PPC: KVM: Disable mmu notifier check

2
0015-linux-user-fix-segfault-deadlock.pa.patch
View File

@ -1,4 +1,4 @@
From a54b43d2a6a1bb3e56c014d828feeb1abe117ee2 Mon Sep 17 00:00:00 2001
From 3daa08dc15e6d8d673b5360aa63e1ea4bc98d9d0 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 13 Jan 2012 17:05:41 +0100
Subject: [PATCH] linux-user: fix segfault deadlock

2
0016-linux-user-binfmt-support-host-bina.patch
View File

@ -1,4 +1,4 @@
From 192e94235372b08d31f8c0c68b89e6b858ca6207 Mon Sep 17 00:00:00 2001
From 18e9f9ce9d4c5881d53ed089184a3f3b1df7f897 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 2 Feb 2012 18:02:33 +0100
Subject: [PATCH] linux-user: binfmt: support host binaries

2
0017-linux-user-arm-no-tb_flush-on-reset.patch
View File

@ -1,4 +1,4 @@
From 5195a60f34bd0315bef418d8a295caebc1a41fef Mon Sep 17 00:00:00 2001
From 4946c30bb4ec03a5f92889e538b5ba6c47b3bdc2 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 29 May 2012 15:30:01 +0200
Subject: [PATCH] linux-user: arm: no tb_flush on reset

2
0018-linux-user-Ignore-broken-loop-ioctl.patch
View File

@ -1,4 +1,4 @@
From 17ef27b9b0f355b296b8819d2cfc463f16e28d15 Mon Sep 17 00:00:00 2001
From 381af044b64a71ba59a6ae0766162c8a4bb06bca Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 12 Jun 2012 04:41:10 +0200
Subject: [PATCH] linux-user: Ignore broken loop ioctl

2
0019-linux-user-fix-segmentation-fault-p.patch
View File

@ -1,4 +1,4 @@
From 614e0fdeab27a5171784758344859a2e18ae2f0b Mon Sep 17 00:00:00 2001
From 790e3e8da8976c8c9a51d89ac3900f2c5750e26b Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 25 Jun 2012 19:02:32 +0200
Subject: [PATCH] linux-user: fix segmentation fault passing with g2h(x) != x

2
0020-linux-user-lock-tcg.patch.patch
View File

@ -1,4 +1,4 @@
From d3fb2ab5ec13b012adfe0a0c7f3ee432355d47f7 Mon Sep 17 00:00:00 2001
From a45d0feaac0c7708c692bc8f42be3c27c47e7a4c Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 5 Jul 2012 17:31:39 +0200
Subject: [PATCH] linux-user: lock tcg

2
0021-linux-user-Run-multi-threaded-code-.patch
View File

@ -1,4 +1,4 @@
From 17de5873ae801c26b3f2d6de681d0a5a41710759 Mon Sep 17 00:00:00 2001
From f537471a496ab597c3f144c7f8227e15c6c9d438 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 10 Jul 2012 20:40:55 +0200
Subject: [PATCH] linux-user: Run multi-threaded code on a single core

2
0022-linux-user-lock-tb-flushing-too.pat.patch
View File

@ -1,4 +1,4 @@
From 64d8e41427b8a90aa9946ec27ebdd06a6b9f3ea9 Mon Sep 17 00:00:00 2001
From be9964c9b53e898f853b4e5d26f3809e25ace09a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 11 Jul 2012 16:47:42 +0200
Subject: [PATCH] linux-user: lock tb flushing too

2
0023-linux-user-Fake-proc-cpuinfo.patch.patch
View File

@ -1,4 +1,4 @@
From fda316ff7dca5b12201a2138436cafc1c7d45caf Mon Sep 17 00:00:00 2001
From 526d9026e266f793ca565956af414a0fab28cc81 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 23 Jul 2012 10:24:14 +0200
Subject: [PATCH] linux-user: Fake /proc/cpuinfo

2
0024-linux-user-implement-FS_IOC_GETFLAG.patch
View File

@ -1,4 +1,4 @@
From 55e815019cdef8fd5757148acaeb89585cfc8765 Mon Sep 17 00:00:00 2001
From cb5f9a7bc4ff7b99a85c3a20e2eb46c6327de27e Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:02:52 +0200
Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl

2
0025-linux-user-implement-FS_IOC_SETFLAG.patch
View File

@ -1,4 +1,4 @@
From bbad99b3fd38b05fe107ae92666146362d2d2a97 Mon Sep 17 00:00:00 2001
From c84d6a1adadb52b976648947e7f16f5c03d6c415 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 20 Aug 2012 00:07:13 +0200
Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl

2
0026-linux-user-XXX-disable-fiemap.patch.patch
View File

@ -1,4 +1,4 @@
From 39efef864747ef7eaa603037c482cd2b72db1a6d Mon Sep 17 00:00:00 2001
From 6338c9b9a458302bbf8d01d9f33bfa3768efe9fa Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 21 Aug 2012 14:20:40 +0200
Subject: [PATCH] linux-user: XXX disable fiemap

6
0027-slirp-nooutgoing.patch.patch
View File

@ -1,4 +1,4 @@
From 8c222b5f901dfa0e9550b693a7fe3710ff354cf4 Mon Sep 17 00:00:00 2001
From c07080eab1123de18ef3eb610ccf721a31a2658a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 18:42:56 +0200
Subject: [PATCH] slirp: -nooutgoing
@ -97,7 +97,7 @@ index e98ce1a..b56bf35 100644
opt = 1;
qemu_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
diff --git a/vl.c b/vl.c
index be0a93c..5305a6d 100644
index 59dc0b4..4bf7351 100644
--- a/vl.c
+++ b/vl.c
@@ -219,6 +219,7 @@ const char *vnc_display;
@ -108,7 +108,7 @@ index be0a93c..5305a6d 100644
static int no_reboot;
int no_shutdown = 0;
int cursor_hide = 1;
@@ -3309,6 +3310,14 @@ int main(int argc, char **argv, char **envp)
@@ -3310,6 +3311,14 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_singlestep:
singlestep = 1;
break;

2
0028-vnc-password-file-and-incoming-conn.patch
View File

@ -1,4 +1,4 @@
From 9902e8075acba3e5c72ca4323f32eb83c2fb8089 Mon Sep 17 00:00:00 2001
From 916f806218045f70a6f0d8f6bbe89ba8b9c1a318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Wed, 29 Aug 2012 20:06:01 +0200
Subject: [PATCH] vnc: password-file= and incoming-connections=

2
0029-linux-user-add-more-blk-ioctls.patc.patch
View File

@ -1,4 +1,4 @@
From 84352c5d04bb482f40bdb177fa174e50ea4f701f Mon Sep 17 00:00:00 2001
From 92ba68874da0fade85cdd1aa23a34831a446e491 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 10 Oct 2012 10:21:20 +0200
Subject: [PATCH] linux-user: add more blk ioctls

2
0030-linux-user-use-target_ulong.patch.patch
View File

@ -1,4 +1,4 @@
From 425ab5a739bf46180cea670f84c3f1f192d565e8 Mon Sep 17 00:00:00 2001
From 6faad754e57607eb0b5de855e16c6ef4d92b58d8 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 9 Oct 2012 09:06:49 +0200
Subject: [PATCH] linux-user: use target_ulong

2
0031-Add-support-for-DictZip-enabled-gzi.patch
View File

@ -1,4 +1,4 @@
From 7325abcf33248bb24403b55c39f126f7831933f6 Mon Sep 17 00:00:00 2001
From 7ac8770a4a64b2a220636d631abacbe02c1de533 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 09:49:37 +0200
Subject: [PATCH] Add support for DictZip enabled gzip files

2
0032-Add-tar-container-format.patch.patch
View File

@ -1,4 +1,4 @@
From 79fcfab471a27a999fc0a6449f1f756bf535cf66 Mon Sep 17 00:00:00 2001
From e6e0a46f91b075258d03576055b4d4fd5ab6f467 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 5 Aug 2009 17:28:38 +0200
Subject: [PATCH] Add tar container format

2
0033-Legacy-Patch-kvm-qemu-preXX-dictzip.patch
View File

@ -1,4 +1,4 @@
From 5bda6c46318586d3aa713be59bfbc47dcd5430f0 Mon Sep 17 00:00:00 2001
From d98278210b69b211eee299c714d1231a7a974b00 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 12 Dec 2012 19:11:30 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch

2
0034-Legacy-Patch-kvm-qemu-preXX-report-.patch
View File

@ -1,4 +1,4 @@
From 38394a9f4343c4a21000b682f28c9e2cd29a9fd8 Mon Sep 17 00:00:00 2001
From 63ffaf3255317c0a0c0708af9747b171961f7f77 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 12 Dec 2012 19:11:31 +0100
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch

2
0035-console-add-question-mark-escape-op.patch
View File

@ -1,4 +1,4 @@
From b6af0376c5a6db3ee33b1669e4b62575a20490e5 Mon Sep 17 00:00:00 2001
From b5f66888d2af64028dc45940165d5381f13dc6e8 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 6 Jun 2011 06:53:52 +0200
Subject: [PATCH] console: add question-mark escape operator

4
0036-Make-char-muxer-more-robust-wrt-sma.patch
View File

@ -1,4 +1,4 @@
From f85044340db052c92385f9c7fb0f41d747eb879a Mon Sep 17 00:00:00 2001
From 8a2bb5917850d9caf0d5984531b745668450dd6f Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 1 Apr 2010 17:36:23 +0200
Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@ -22,7 +22,7 @@ This patch fixes input when using -nographic on s390 for me.
1 file changed, 16 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 30a2ddf..351a44b 100644
index cff2896..206bd07 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -260,6 +260,9 @@ typedef struct {

2
0037-linux-user-lseek-explicitly-cast-en.patch
View File

@ -1,4 +1,4 @@
From a57e1b7aafc2a859e79a6818b30360094c047b47 Mon Sep 17 00:00:00 2001
From f4310e6dc96e9036cd40d6b804019c4edbbb97f5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Thu, 13 Dec 2012 14:29:22 +0100
Subject: [PATCH] linux-user: lseek: explicitly cast end offsets to signed

2
0038-virtfs-proxy-helper-Provide-__u64-f.patch
View File

@ -1,4 +1,4 @@
From ab956babd052f8d3c68b9f90426553d6794c2473 Mon Sep 17 00:00:00 2001
From 7983edf59204dc1fdfa07872c6ce3d0f2d520b29 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Thu, 16 May 2013 12:39:10 +0200
Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken

3
qemu-1.5.0-rc2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e327a34c7f7079bc3316523abfbf4ec5c39209492878adf49870ca3c6e6231fd
size 11933048

3
qemu-1.5.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb
size 11931067

9
qemu.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon May 20 21:14:08 UTC 2013 - afaerber@suse.de
- Update to v1.5.0 final: Cf. http://wiki.qemu.org/ChangeLog/1.5
* Adapt update_git.sh accordingly
* Add BuildRequires for gtk2/3 and vte2 to enable new frontend
* Place translations into new qemu-lang package
* Really enable SPICE support from 11.4 in configure, too
-------------------------------------------------------------------
Fri May 17 13:47:21 UTC 2013 - afaerber@suse.de

40
qemu.spec
View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 1.5.0rc2
Version: 1.5.0
Release: 0
Source: %name-1.5.0-rc2.tar.bz2
Source: %name-%version.tar.bz2
Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patc.patch
Patch0002: 0002-XXX-work-around-SA_RESTART-race-wit.patch
Patch0003: 0003-qemu-0.9.0.cvs-binfmt.patch.patch
@ -74,6 +74,11 @@ BuildRequires: bluez-devel
BuildRequires: curl-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
%if 0%{?suse_version} >= 1220
BuildRequires: gtk3-devel
%else
BuildRequires: gtk2-devel
%endif
BuildRequires: libaio
BuildRequires: libaio-devel
BuildRequires: libattr-devel
@ -91,6 +96,9 @@ BuildRequires: ncurses-devel
%if 0%{?qemu_user_space_build:1}
BuildRequires: -post-build-checks
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: vte2-devel
%endif
%if 0%{?suse_version} >= 1120
BuildRequires: zlib-devel-static
%else
@ -135,6 +143,21 @@ binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
%if 0%{?suse_version} >= 1210
%package lang
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
%description lang
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains translations.
%endif
%package tools
Summary: Universal CPU emulator -- Tools
Group: System/Emulators/PC
@ -181,7 +204,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n %name-1.5.0-rc2
%setup -q #-n %name-1.5.0-rc2
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -232,6 +255,9 @@ mkdir -p dynamic
--enable-virtfs \
--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
%if 0%{?suse_version} >= 1210
--enable-gtk \
%endif
%if 0%{?suse_version} >= 1140
%ifarch %ix86 x86_64
--enable-spice
%else
@ -286,6 +312,9 @@ ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
%ifnarch ia64
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
%endif
%if 0%{?suse_version} >= 1210
%find_lang %name
%endif
%fdupes -s $RPM_BUILD_ROOT
%clean
@ -318,6 +347,11 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/target-x86_64.conf
%if 0%{?suse_version} >= 1210
%files lang -f %name.lang
%defattr(-, root, root)
%endif
%files tools
%defattr(-, root, root)
%doc %_mandir/man1/qemu-img.1.gz

40
qemu.spec.in
View File

@ -21,9 +21,9 @@ Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
Group: System/Emulators/PC
Version: 1.5.0rc2
Version: 1.5.0
Release: 0
Source: %name-1.5.0-rc2.tar.bz2
Source: %name-%version.tar.bz2
PATCH_FILES
# this is to make lint happy
Source300: rpmlintrc
@ -37,6 +37,11 @@ BuildRequires: bluez-devel
BuildRequires: curl-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
%if 0%{?suse_version} >= 1220
BuildRequires: gtk3-devel
%else
BuildRequires: gtk2-devel
%endif
BuildRequires: libaio
BuildRequires: libaio-devel
BuildRequires: libattr-devel
@ -54,6 +59,9 @@ BuildRequires: ncurses-devel
%if 0%{?qemu_user_space_build:1}
BuildRequires: -post-build-checks
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: vte2-devel
%endif
%if 0%{?suse_version} >= 1120
BuildRequires: zlib-devel-static
%else
@ -98,6 +106,21 @@ binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
%if 0%{?suse_version} >= 1210
%package lang
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
%description lang
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains translations.
%endif
%package tools
Summary: Universal CPU emulator -- Tools
Group: System/Emulators/PC
@ -144,7 +167,7 @@ emulations. This can be used together with the OBS build script to
run cross-architecture builds.
%prep
%setup -q -n %name-1.5.0-rc2
%setup -q #-n %name-1.5.0-rc2
PATCH_EXEC
%build
@ -158,6 +181,9 @@ mkdir -p dynamic
--enable-virtfs \
--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
%if 0%{?suse_version} >= 1210
--enable-gtk \
%endif
%if 0%{?suse_version} >= 1140
%ifarch %ix86 x86_64
--enable-spice
%else
@ -212,6 +238,9 @@ ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
%ifnarch ia64
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
%endif
%if 0%{?suse_version} >= 1210
%find_lang %name
%endif
%fdupes -s $RPM_BUILD_ROOT
%clean
@ -244,6 +273,11 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/target-x86_64.conf
%if 0%{?suse_version} >= 1210
%files lang -f %name.lang
%defattr(-, root, root)
%endif
%files tools
%defattr(-, root, root)
%doc %_mandir/man1/qemu-img.1.gz

2
update_git.sh
View File

@ -13,7 +13,7 @@
GIT_TREE=git://github.com/openSUSE/qemu.git
GIT_LOCAL_TREE=/suse/agraf/git/qemu
GIT_BRANCH=opensuse-1.5
GIT_UPSTREAM_TAG=v1.5.0-rc2
GIT_UPSTREAM_TAG=v1.5.0
QEMU_TMP=/dev/shm/qemu-tmp
# clean up