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 <sbona...@redhat.com> (cherry picked from commit 0ad8c8c652ae2a7c8dfa810d150841a32926cf6e) --- M ovirt-engine.spec.in 1 file changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/28067/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 0938960..ed45dea 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -45,6 +45,13 @@ %global ovirt_install_systemv 0 %global ovirt_install_poms 1 %global ovirt_require_maven 1 +%if %{fedora} >= 20 +%global ovirt_provides_jboss 1 +%global jboss ovirt-engine-jboss-as >= 7.1.1 +%else +%global ovirt_provides_jboss 0 +%global jboss jboss-as >= 7.1.1-9.3 +%endif %endif %if 0%{?rhel} @@ -52,6 +59,8 @@ %global ovirt_install_systemv 1 %global ovirt_install_poms 0 %global ovirt_require_maven 0 +%global ovirt_provides_jboss 1 +%global jboss ovirt-engine-jboss-as >= 7.1.1 %endif %global ovirt_product_name oVirt Engine @@ -162,6 +171,7 @@ %endif BuildRequires: unzip +Requires: %{jboss} Requires: %{name}-backend = %{version}-%{release} Requires: %{name}-cli Requires: %{name}-dbscripts = %{version}-%{release} @@ -172,7 +182,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 @@ -701,6 +710,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 @@ -920,7 +936,10 @@ %{engine_data}/setup/plugins/*/ovirt-engine/ %{engine_data}/setup/plugins/ovirt-engine-rename/ -# backward compatibility +%if %{ovirt_provides_jboss} +%config %{_sysconfdir}/ovirt-engine-setup.conf.d/10-packaging-jboss.conf +%endif + # backward compatibility (pre-3.4) %ghost %config(noreplace) %{engine_etc}/sysprep/ %ghost %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml -- To view, visit http://gerrit.ovirt.org/28067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icef92a1f22e6f88458d1624429dff57a9817192f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
