Rebase to qemu-5.2.0-rc1
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
parent
28222ce611
commit
5bc1125531
1
.gitignore
vendored
1
.gitignore
vendored
@ -47,3 +47,4 @@
|
||||
/qemu-5.1.0-rc3.tar.xz
|
||||
/qemu-5.1.0.tar.xz
|
||||
/qemu-5.2.0-rc0.tar.xz
|
||||
/qemu-5.2.0-rc1.tar.xz
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 1249e3b862a119bdcba74f8f052222cc28de988d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <1249e3b862a119bdcba74f8f052222cc28de988d.1604591893.git.crobinso@redhat.com>
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Thu, 5 Nov 2020 09:56:53 -0500
|
||||
Subject: [PATCH] configure: Fix gio detection
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 2c3c69f118..bc06aa81e5 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3499,7 +3499,7 @@ if $pkg_config --atleast-version=$glib_req_ver gio-2.0; then
|
||||
# with pkg-config --static --libs data for gio-2.0 that is missing
|
||||
# -lblkid and will give a link error.
|
||||
write_c_skeleton
|
||||
- if compile_prog "" "gio_libs" ; then
|
||||
+ if compile_prog "" "$gio_libs" ; then
|
||||
gio=yes
|
||||
else
|
||||
gio=no
|
||||
--
|
||||
2.28.0
|
||||
|
10
qemu.spec
10
qemu.spec
@ -203,7 +203,7 @@
|
||||
%{obsoletes_block_rbd}
|
||||
|
||||
# Release candidate version tracking
|
||||
%global rcver rc0
|
||||
%global rcver rc1
|
||||
%if 0%{?rcver:1}
|
||||
%global rcrel .%{rcver}
|
||||
%global rcstr -%{rcver}
|
||||
@ -213,13 +213,12 @@
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 5.2.0
|
||||
Release: 0.1%{?rcrel}%{?dist}
|
||||
Release: 0.2%{?rcrel}%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and BSD and MIT and CC-BY
|
||||
URL: http://www.qemu.org/
|
||||
|
||||
Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz
|
||||
Patch0001: 0001-configure-Fix-gio-detection.patch
|
||||
|
||||
# guest agent service
|
||||
Source10: qemu-guest-agent.service
|
||||
@ -376,6 +375,8 @@ BuildRequires: libzstd-devel
|
||||
BuildRequires: hostname
|
||||
# nvdimm dax
|
||||
BuildRequires: daxctl-devel
|
||||
# used by some linux user impls
|
||||
BuildRequires: libdrm-devel
|
||||
|
||||
BuildRequires: glibc-static pcre-static glib2-static zlib-static
|
||||
|
||||
@ -1899,6 +1900,9 @@ getent passwd qemu >/dev/null || \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 11 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.2.rc1
|
||||
- Rebase to qemu-5.2.0-rc1
|
||||
|
||||
* Sun Nov 08 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.1.rc0
|
||||
- Rebase to qemu-5.2.0-rc0
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qemu-5.2.0-rc0.tar.xz) = ef209ce8fa659d199f95e3d2d9df23169c1c4aad4cc5ddf7757dfce2b3237b9694a3267be61d802e242b7ca09d321fc83cefd913af2dea59022e0b6b87c686ca
|
||||
SHA512 (qemu-5.2.0-rc1.tar.xz) = 5345c9e8811efe2c1bab92ecb846f267dc6ef2a67ac03a39547344dc810a13027ef7352c7209d528ec81108dbc1e5e9ca96da6f7306c682ad8f785f596fa4dde
|
||||
|
Loading…
x
Reference in New Issue
Block a user