- up to 2.6.0

diff --git a/libjpeg-boolean.patch b/libjpeg-boolean.patch
index c3218309f0dc0f889d6b0025ca928a1e90caf53e..cd1da49df373d5ca833d48e3d92ec7ea64927d15 100644 (file)
--- a/libjpeg-boolean.patch
+++ b/libjpeg-boolean.patch
@@ -1,10 +1,9 @@
-diff -dur qemu-1.7.1.orig/ui/vnc-enc-tight.c qemu-1.7.1/ui/vnc-enc-tight.c
---- qemu-1.7.1.orig/ui/vnc-enc-tight.c 2014-03-25 15:01:10.000000000 +0100
-+++ qemu-1.7.1/ui/vnc-enc-tight.c      2014-04-09 11:36:05.000000000 +0200
-@@ -41,6 +41,8 @@
+--- qemu-2.6.0/ui/vnc-enc-tight.c~     2016-05-11 17:56:18.000000000 +0200
++++ qemu-2.6.0/ui/vnc-enc-tight.c      2016-05-12 12:15:06.418186314 +0200
+@@ -40,6 +40,8 @@
+ #include <png.h>
  #endif
  #ifdef CONFIG_VNC_JPEG
- #include <stdio.h>
 +#define HAVE_BOOLEAN
 +#define boolean int
  #include <jpeglib.h>

diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index 4d89cb2f453f1d07775423f85cf237fae838d1ff..c137485ed33f6a0e027a3bcc69ebad5a5070b021 100644 (file)
--- a/qemu-xattr.patch
+++ b/qemu-xattr.patch
@@ -5,19 +5,20 @@ 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.
+@@ -10,6 +10,7 @@
   */
  
+ #include "qemu/osdep.h"
 +#include "qemu/xattr.h"
  #include <sys/resource.h>
  #include <getopt.h>
  #include <syslog.h>
-@@ -22,7 +23,6 @@
+@@ -23,7 +24,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"
+ #include "9p-iov-marshal.h"
+ #include "hw/9pfs/9p-proxy.h"
+ #include "fsdev/9p-iov-marshal.h"
+

diff --git a/qemu.spec b/qemu.spec
index 577b75e74477d4e72c9c1e5a94f40aa825179d8a..7bbbcae6a1a5fa01075ed50b0111622d5e3fccdb 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -36,12 +36,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       2.5.1.1
+Version:       2.6.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: f5ff0e71398b9e428b4f177001ba4285
+# Source0-md5: ca3f70b43f093e33e9e014f144067f13
 Source2:       %{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
@@ -1004,7 +1004,6 @@ fi
 %{_datadir}/%{name}/pxe-virtio.rom
 %{_datadir}/%{name}/qemu_logo_no_text.svg
 %{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-zipl.rom
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
@@ -1144,7 +1143,6 @@ fi
 %{_datadir}/%{name}/bios.bin
 %{_datadir}/%{name}/bios-256k.bin
 %{_datadir}/%{name}/acpi-dsdt.aml
-%{_datadir}/%{name}/q35-acpi-dsdt.aml
 
 %files system-xtensa
 %defattr(644,root,root,755)