Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: spec: support distro without jboss-as 7 ......................................................................
packaging: spec: support distro without jboss-as 7 A new package providing jboss-as 7 for distro that don't ship it has been created as ovirt-engine-jboss-as. The package can be installed side-by-side with wildfly on Fedora 20 and doesn't conflict with jboss-as manual installations on /usr/share/jboss-as using its own directory. The package is built by http://jenkins.ovirt.org/job/ovirt-engine-jboss-as_master_create-rpms_merged The spec file has been updated for EL6 and F20 in order to require the new package and provide the environment keys for automatically set jboss home directory. Change-Id: Icef92a1f22e6f88458d1624429dff57a9817192f Bug-Url: https://bugzilla.redhat.com/1055604 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt-engine.spec.in 1 file changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/28064/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 0f4a915..42256e7 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -45,6 +45,11 @@ %global ovirt_install_systemv 0 %global ovirt_install_poms 1 %global ovirt_require_maven 1 +%if %{fedora} >= 20 +%global ovirt_provides_jboss 1 +%else +%global ovirt_provides_jboss 0 +%endif %endif %if 0%{?rhel} @@ -52,6 +57,7 @@ %global ovirt_install_systemv 1 %global ovirt_install_poms 0 %global ovirt_require_maven 0 +%global ovirt_provides_jboss 1 # emulate fedora java for simplicity %undefine add_maven_depmap @@ -164,7 +170,7 @@ Group: %{ovirt_product_group} License: ASL 2.0 URL: http://www.ovirt.org -Source0: http://ovirt.org/releases/stable/src/@PACKAGE_NAME@-@[email protected] +Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/@PACKAGE_NAME@/@PACKAGE_NAME@-@[email protected] BuildArch: noarch @@ -187,7 +193,6 @@ Requires: %{name}-websocket-proxy >= %{version}-%{release} Requires: java Requires: java-1.7.0-openjdk >= 1:1.7.0.9-2.3.3.2 -Requires: jboss-as >= 7.1.1-9.3 Requires: jpackage-utils Requires: ovirt-image-uploader >= 3.3.0 Requires: ovirt-iso-uploader >= 3.3.0 @@ -195,6 +200,13 @@ Requires: postgresql-server >= 8.4.7 Requires: ws-commons-util Requires: yum-plugin-versionlock + +%if %{ovirt_provides_jboss} +Requires: ovirt-engine-jboss-as >= 7.1.1 +%else +Requires: jboss-as >= 7.1.1-9.3 +%endif + %if 0%{?fedora} %if %{fedora} >= 19 @@ -753,6 +765,13 @@ VDSM/disableNetworkManager=bool:False __EOF__ +%if %{ovirt_provides_jboss} +cat > "%{buildroot}%{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-jboss.conf" << __EOF__ +[environment:default] +OVESETUP_CONFIG/jbossHome=str:/usr/share/ovirt-engine-jboss-as +__EOF__ +%endif + # # bakcward compatibility # keep ovirt-engine-setup package to pull ovirt-engine-setup-plugin-ovirt-engine @@ -931,6 +950,9 @@ %files setup-plugin-ovirt-engine %config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging.conf +%if %{ovirt_provides_jboss} +%config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-jboss.conf +%endif %{_bindir}/engine-upgrade-check %{engine_data}/conf/ovirt-engine-proxy.conf.v2.in %{engine_data}/conf/ovirt-engine-root-redirect.conf.in -- To view, visit http://gerrit.ovirt.org/28064 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icef92a1f22e6f88458d1624429dff57a9817192f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
