- updated to 1.7.1

- added xattr patch (fixes sys/xattr.h vs linux/xattr.h conflicts)

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
new file mode 100644 (file)
index 0000000..4d89cb2
--- /dev/null
+++ b/qemu-xattr.patch
@@ -0,0 +1,23 @@
+Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict:
+When including both, the latter must be included first.
+Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front,
+before <sys/capability.h> (which includes <linux/xattr.h>.
+
+--- qemu-1.7.1/fsdev/virtfs-proxy-helper.c.orig        2014-03-25 15:01:10.000000000 +0100
++++ qemu-1.7.1/fsdev/virtfs-proxy-helper.c     2014-04-03 02:55:41.115547990 +0200
+@@ -9,6 +9,7 @@
+  * the COPYING file in the top-level directory.
+  */
+ 
++#include "qemu/xattr.h"
+ #include <sys/resource.h>
+ #include <getopt.h>
+ #include <syslog.h>
+@@ -22,7 +23,6 @@
+ #endif
+ #include "qemu-common.h"
+ #include "qemu/sockets.h"
+-#include "qemu/xattr.h"
+ #include "virtio-9p-marshal.h"
+ #include "hw/9pfs/virtio-9p-proxy.h"
+ #include "fsdev/virtio-9p-marshal.h"

diff --git a/qemu.spec b/qemu.spec
index a142f280c03027dea35fae5223e85d8603ddb51f..d3cfa3399a68ea16bb57c9e10d8b24ea750d907f 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -15,12 +15,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       1.7.0
-Release:       4
+Version:       1.7.1
+Release:       1
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 32893941d40d052a5e649efcf06aca06
+# Source0-md5: 9541063d999cf9659ed7fdce71314f31
 Source2:       %{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
@@ -40,6 +40,7 @@ Patch1:               vgabios-widescreens.patch
 Patch2:                %{name}-whitelist.patch
 Patch3:                %{name}-system-libcacard.patch
 Patch4:                vmdk3ro.patch
+Patch5:                %{name}-xattr.patch
 # Proof of concept, for reference, do not remove
 Patch400:      %{name}-kde_virtual_workspaces_hack.patch
 URL:           http://www.qemu-project.org/
@@ -585,6 +586,7 @@ Ten pakiet nie musi być zainstalowany w systemie hosta.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__mv} libcacard libcacard-use-system-lib