Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: spec: fix avalon link for el7 ......................................................................
packaging: spec: fix avalon link for el7 Change-Id: I2dda3c8498179d5d4bb962554345be3ca1aa5098 Bug-Url: https://bugzilla.redhat.com/1159293 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M ovirt-engine.spec.in 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/35469/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index ff8e3f3..4ecb586 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -48,6 +48,7 @@ %global ovirt_install_systemv 0 %global ovirt_install_poms 1 %global ovirt_require_maven 1 +%global separate_avalon_jars 1 %if %{fedora} >= 20 %global ovirt_provides_jboss 1 %global jboss ovirt-engine-jboss-as >= 7.1.1 @@ -65,6 +66,7 @@ %global ovirt_require_maven 1 %global ovirt_provides_jboss 1 %global jboss ovirt-engine-jboss-as >= 7.1.1 +%global separate_avalon_jars 1 %else %global ovirt_install_systemd 0 %global ovirt_install_systemv 1 @@ -72,6 +74,7 @@ %global ovirt_require_maven 0 %global ovirt_provides_jboss 1 %global jboss ovirt-engine-jboss-as >= 7.1.1 +%global separate_avalon_jars 0 # emulate fedora java for simplicity %undefine add_maven_depmap @@ -771,7 +774,7 @@ common/org/tukaani/xz/main/xz.jar %endif %endif -%if 0%{?rhel} +%if 0%{!?separate_avalon_jars:1} 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 -- To view, visit http://gerrit.ovirt.org/35469 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2dda3c8498179d5d4bb962554345be3ca1aa5098 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
