Change in vdsm[ovirt-3.5]: spec: split qemu-kvm* requirement to its own %if
danken at redhat.com
danken at redhat.com
Fri Sep 26 13:34:14 UTC 2014
Hello Federico Simoncelli,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/33406
to review the following change.
Change subject: spec: split qemu-kvm* requirement to its own %if
......................................................................
spec: split qemu-kvm* requirement to its own %if
qemu-kvm* dependency is about to become even more complex, and as such
it is granted a special %if section.
Change-Id: I088eee894b631d9f864d6b7563877bf3ac76a9f3
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/33378
Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
---
M vdsm.spec.in
1 file changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/33406/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index e49bf29..a00f68c 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -180,14 +180,9 @@
Requires: lvm2
Requires: python
Requires: policycoreutils-python
-Requires: qemu-kvm-rhev
-Requires: qemu-img-rhev
Requires: selinux-policy-targeted
%else
Requires: python
-# Update the qemu-kvm-rhev requires when block_stream will be included
-Requires: qemu-kvm-rhev >= 2:0.12.1.2-2.415.el6_5.3
-Requires: qemu-img-rhev >= 2:0.12.1.2-2.415.el6_5.3
Requires: device-mapper-multipath >= 0.4.9-52
Requires: e2fsprogs >= 1.41.12-11
Requires: fence-agents
@@ -204,8 +199,6 @@
Requires: kernel >= 3.11.3-201
# Subprocess and thread bug was found on python 2.7.2
Requires: python >= 2.7.3
-Requires: qemu-kvm >= 2:0.15.0-4
-Requires: qemu-img >= 2:0.15.0-4
Requires: python-ethtool >= 0.8-1
Requires: initscripts >= 9.42.2-1
Requires: device-mapper-multipath >= 0.4.9-18
@@ -221,6 +214,19 @@
Requires: systemd >= 197-1.fc18.2
%endif
+%if 0%{?rhel}
+%if 0%{?rhel} >= 7
+Requires: qemu-kvm-rhev
+Requires: qemu-img-rhev
+%else
+Requires: qemu-kvm-rhev >= 2:0.12.1.2-2.415.el6_5.3
+Requires: qemu-img-rhev >= 2:0.12.1.2-2.415.el6_5.3
+%endif
+%else
+Requires: qemu-kvm >= 2:0.15.0-4
+Requires: qemu-img >= 2:0.15.0-4
+%endif
+
# GlusterFS client-side RPMs needed for Gluster SD
%if 0%{?with_gluster}
Requires: glusterfs >= 3.4.2
--
To view, visit http://gerrit.ovirt.org/33406
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I088eee894b631d9f864d6b7563877bf3ac76a9f3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
More information about the vdsm-patches
mailing list