Juan Hernandez has uploaded a new change for review. Change subject: packaging: Use correct Avalon Framework .jar files in EL7 ......................................................................
packaging: Use correct Avalon Framework .jar files in EL7 In version 7 of RHEL and CentOS the Avalon Framework .jar files are split, like in Fedora, but currently we assume that they aren't, as that was the case in version 6. This modifies the .spec file so that this difference is taken into account. Change-Id: Idd0ea12dfbd3ad695cc2a3390fd3d104d2823ea9 Bug-Url: https://bugzilla.redhat.com/1168405 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> (cherry picked from commit b5d7622f742152d62d850349d7475efed5ff4f3b) --- M ovirt-engine.spec.in 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/35667/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index de14072..a022d95 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -764,8 +764,13 @@ %endif %endif %if 0%{?rhel} -org/apache/avalon/framework/main/avalon-framework-api.jar avalon-framework.jar -org/apache/avalon/framework/main/avalon-framework-impl.jar avalon-framework.jar +%if %{rhel} >= 7 +common/org/apache/avalon/framework/main/avalon-framework-api.jar +common/org/apache/avalon/framework/main/avalon-framework-impl.jar +%else +common/org/apache/avalon/framework/main/avalon-framework-api.jar avalon-framework.jar +common/org/apache/avalon/framework/main/avalon-framework-impl.jar avalon-framework.jar +%endif %endif __EOF__ -- To view, visit http://gerrit.ovirt.org/35667 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd0ea12dfbd3ad695cc2a3390fd3d104d2823ea9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
