Change in vdsm[master]: Do not reference qemu hook on RHEL 6 in spec file

[Martin Sivak]

Martin Sivák has uploaded a new change for review.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Do not reference qemu hook on RHEL 6 in spec file

The previous patch skips the qemu hook installation on RHEL 6,
but still references it in the %files section.

This fixes that.

Change-Id: Ic167e5651960519206d9b8cb3a933a2e238d4321
Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1138340
Signed-off-by: Martin Sivak 
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/33061/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index a0b7ebc..8438df7 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -992,7 +992,9 @@
 %{_sysconfdir}/sudoers.d/50_vdsm
 %{_sysconfdir}/cron.hourly/vdsm-logrotate
 %{_sysconfdir}/cron.d/vdsm-libvirt-logrotate
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_sysconfdir}/libvirt/hooks/qemu
+%endif
 %{_datadir}/%{vdsm_name}/logUtils.py*
 %{_datadir}/%{vdsm_name}/dsaversion.py*
 %{_libexecdir}/%{vdsm_name}/curl-img-wrap

[Martin Sivak]

Martin Sivák has posted comments on this change.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Patch Set 1: Verified+1

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/363... : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/380/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11583/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12527/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12372/ : SUCCESS

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Patch Set 1: Code-Review+2

thanks for unbreaking el6.

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Do not reference qemu hook on RHEL 6 in spec file

The previous patch skips the qemu hook installation on RHEL 6,
but still references it in the %files section.

This fixes that.

Change-Id: Ic167e5651960519206d9b8cb3a933a2e238d4321
Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1138340
Signed-off-by: Martin Sivak 
Reviewed-on: http://gerrit.ovirt.org/33061
Tested-by: Martin Sivák 
Reviewed-by: Dan Kenigsberg 
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Martin Sivák: Verified
  Dan Kenigsberg: Looks good to me, approved

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Do not reference qemu hook on RHEL 6 in spec file
......................................................................

Patch Set 2:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged/1873/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/214/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5847/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4006/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/11/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/11/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/6/ : FAILURE