From 94ddf1cc6a9991b360c216ec101ee6b8bb17c0fe Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 19 2016 13:20:37 +0000 Subject: Rebase to qemu 2.7.0-rc3 --- diff --git a/for-2.7-virtio-gpu-fix-missing-log.h-include-file.patch b/for-2.7-virtio-gpu-fix-missing-log.h-include-file.patch deleted file mode 100644 index 46367ab..0000000 --- a/for-2.7-virtio-gpu-fix-missing-log.h-include-file.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h -index e4f424a..20d1cd6 100644 ---- a/include/hw/virtio/virtio-gpu.h -+++ b/include/hw/virtio/virtio-gpu.h -@@ -19,6 +19,7 @@ - #include "ui/console.h" - #include "hw/virtio/virtio.h" - #include "hw/pci/pci.h" -+#include "qemu/log.h" - - #include "standard-headers/linux/virtio_gpu.h" - #define TYPE_VIRTIO_GPU "virtio-gpu-device" diff --git a/qemu.spec b/qemu.spec index 48ffbd3..e3b5e69 100644 --- a/qemu.spec +++ b/qemu.spec @@ -50,7 +50,7 @@ %undefine _hardened_build # Release candidate version tracking -%global rcver rc2 +%global rcver rc3 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -60,7 +60,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 2.7.0 -Release: 0.1%{?rcrel}%{?dist} +Release: 0.2%{?rcrel}%{?dist} Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools @@ -92,9 +92,6 @@ Source20: kvm.conf # /etc/sysctl.d/50-kvm-s390x.conf Source21: 50-kvm-s390x.conf -# Build fix, posted upstream -Patch0001: for-2.7-virtio-gpu-fix-missing-log.h-include-file.patch - # documentation deps BuildRequires: texi2html BuildRequires: texinfo @@ -1545,6 +1542,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Fri Aug 19 2016 Cole Robinson - 2:2.7.0-0.2.rc3 +- Rebase to qemu 2.7.0-rc3 + * Wed Aug 03 2016 Cole Robinson - 2:2.7.0-0.1.rc2 - Rebase to qemu 2.7.0-rc2 diff --git a/sources b/sources index 2edd11a..78200da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25b45e67dde60ebfc0bdfae4f3c7e26b qemu-2.7.0-rc2.tar.bz2 +c6386f929ac28f442e8b8bb4b63d809c qemu-2.7.0-rc3.tar.bz2