Change in vdsm[master]: spec: do not require qemu-kvm-rhev on Fedora

danken at redhat.com danken at redhat.com
Thu Sep 25 12:32:26 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

Change subject: spec: do not require qemu-kvm-rhev on Fedora
......................................................................

spec: do not require qemu-kvm-rhev on Fedora

qemu-kvm-rhev is required for oVirt's feature completeness. However it
is not shipped within Fedora. When Vdsm is built for Fedora, we cannot
require it. However, when built for oVirt and downstream RHEV, it is
simpler and nicer to have a strict hard requirement.

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


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/33367/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3eb0d0b..fe95374 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -184,14 +184,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
@@ -208,8 +203,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
@@ -224,6 +217,19 @@
 Requires: systemd >= 197-1.fc18.2
 %endif
 
+%if 0%{?rhel}
+%if %{fedora_koji_build}
+Requires: qemu-kvm >= 2:0.12.1.2-2.415.el6_5.3
+Requires: qemu-img >= 2:0.12.1.2-2.415.el6_5.3
+%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/33367
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If272983362d5b0f11d0925c64315a046d3b144d0
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