Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: spec: move branding.jar to javalib ......................................................................
packaging: spec: move branding.jar to javalib this will enable reuse by other packages, branding especially. Change-Id: Ie44e9483eb39d4c0fa9a398adbb050bc33ddeee4 Signed-off-by: Alon Bar-Lev <[email protected]> --- M ovirt-engine.spec.in 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/23909/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 5c5880a..9f20677 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -566,12 +566,21 @@ install -dm 755 "%{buildroot}%{engine_java}" while read lib_path; do java_path="%{engine_java}/$(basename "${lib_path}")" - mv "%{buildroot}/${lib_path}" "%{buildroot}/${java_path}" + if ! [ -e "%{buildroot}/${java_path}" ] && [ -f "%{buildroot}/${lib_path}" ]; then + cp "%{buildroot}/${lib_path}" "%{buildroot}/${java_path}" + fi + rm -f "%{buildroot}/${lib_path}" ln -s "${java_path}" "%{buildroot}${lib_path}" done << __EOF__ %{engine_ear}/bll.jar +%{engine_ear}/docs.war/WEB-INF/lib/branding.jar +%{engine_ear}/legacy_restapi.war/WEB-INF/lib/branding.jar %{engine_ear}/lib/vdsbroker.jar +%{engine_ear}/restapi.war/WEB-INF/lib/branding.jar %{engine_ear}/scheduler.jar +%{engine_ear}/userportal.war/WEB-INF/lib/branding.jar +%{engine_ear}/webadmin.war/WEB-INF/lib/branding.jar +%{engine_ear}/welcome.war/WEB-INF/lib/branding.jar %{engine_jboss_modules}/org/ovirt/engine/core/authentication/main/authentication.jar %{engine_jboss_modules}/org/ovirt/engine/core/common/main/common.jar %{engine_jboss_modules}/org/ovirt/engine/core/compat/main/compat.jar @@ -775,6 +784,7 @@ %{engine_etc}/branding/00-ovirt.brand %{engine_etc}/engine.conf.d/ %{engine_java}/authentication.jar +%{engine_java}/branding.jar %{engine_java}/common.jar %{engine_java}/compat.jar %{engine_java}/utils.jar -- To view, visit http://gerrit.ovirt.org/23909 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie44e9483eb39d4c0fa9a398adbb050bc33ddeee4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
