Change in vdsm[master]: spec: split qemu-kvm* requirement to its own %if

danken at redhat.com danken at redhat.com
Thu Sep 25 17:25:07 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

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. One of the three occurences of
qemu-kvm-rhev can be dropped, since el6's current requirement equally
applies to el7.

Change-Id: I088eee894b631d9f864d6b7563877bf3ac76a9f3
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/33378/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 56d2579..d93d32e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -187,14 +187,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
@@ -211,8 +206,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: initscripts >= 9.42.2-1
 Requires: device-mapper-multipath >= 0.4.9-18
 Requires: e2fsprogs >= 1.41.14
@@ -227,6 +220,14 @@
 Requires: systemd >= 197-1.fc18.2
 %endif
 
+%if 0%{?rhel}
+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
+%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/33378
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I088eee894b631d9f864d6b7563877bf3ac76a9f3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list