Juan Hernandez has uploaded a new change for review.

Change subject: userportal: Deploy to a separate directory
......................................................................

userportal: Deploy to a separate directory

Currently we package the user portal as a subdirectory inside the .ear.
This means that the userportal package requires the backend in order to
be installed. This patch moves the userportal to its own directlry and
removes this dependency.

Change-Id: I3f203b24bcecaa9ccafe7566b63680f54c52d3ed
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M packaging/fedora/spec/ovirt-engine.spec.in
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/11761/1

diff --git a/packaging/fedora/spec/ovirt-engine.spec.in 
b/packaging/fedora/spec/ovirt-engine.spec.in
index ada35bb..35d4713 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -279,7 +279,6 @@
 %package userportal
 Summary: User Portal of %{product_name_short}
 Group: Virtualization/Management
-Requires: %{name} = %{version}-%{release}
 
 %description userportal
 The user portal interface to %{product_name_short}
@@ -490,6 +489,11 @@
 snakeyaml snakeyaml
 .
 
+# Move the userportal to its own independent directory and replace it
+# with a symbolic link:
+mv %{buildroot}%{engine_ear}/userportal.war 
%{buildroot}%{engine_data}-userportal
+ln -s %{engine_data}-userportal %{buildroot}%{engine_ear}/userportal.war
+
 # Copy the module definitions:
 install -dm 755 %{buildroot}%{engine_jboss_modules}
 cp -r deployment/modules/* %{buildroot}%{engine_jboss_modules}
@@ -655,6 +659,7 @@
 %{engine_ear}/engine-bll.jar
 %{engine_ear}/engine-scheduler.jar
 %{engine_ear}/ovirtengineweb.war
+%{engine_ear}/userportal.war
 
 # Root web application:
 %{root_war}
@@ -756,7 +761,7 @@
 
 %files userportal
 %config(noreplace) %{engine_etc}/usbfilter.txt
-%{engine_ear}/userportal.war
+%{engine_data}-userportal
 
 
 %files webadmin-portal


--
To view, visit http://gerrit.ovirt.org/11761
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f203b24bcecaa9ccafe7566b63680f54c52d3ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to