Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: add manual reference ......................................................................
packaging: add manual reference empty manual to allow application to handle using single execution path. as this is not really a manual, move out of /usr/share/doc/ Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1002353 Change-Id: I00c6a0a554bf684c38f7db21fcbf31621996a0bd Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M Makefile M ovirt-engine.spec.in A packaging/manual/DocumentationPath.csv A packaging/manual/UserPortalDocumentationPath.csv M packaging/services/ovirt-engine/ovirt-engine.conf.in 5 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/19552/1 diff --git a/Makefile b/Makefile index e8c936f..cfd8af3 100644 --- a/Makefile +++ b/Makefile @@ -339,7 +339,7 @@ $(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)" $(MAKE) copy-recursive SOURCEDIR=packaging/etc TARGETDIR="$(DESTDIR)$(PKG_SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)" $(MAKE) copy-recursive SOURCEDIR=packaging/pki TARGETDIR="$(DESTDIR)$(PKG_PKI_DIR)" EXCLUDE_GEN="$(GENERATED)" - for d in bin branding conf firewalld services setup; do \ + for d in bin branding conf firewalld manual services setup; do \ $(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \ done $(MAKE) copy-recursive SOURCEDIR=packaging/man TARGETDIR="$(DESTDIR)$(MAN_DIR)" EXCLUDE_GEN="$(GENERATED)" diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index db07f3c..a5e018f 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -715,6 +715,7 @@ %dir %{engine_ear} %dir %{engine_etc}/osinfo.conf.d %{engine_data}/conf/osinfo-defaults.properties +%{engine_data}/manual/ %{engine_ear}/META-INF %{engine_ear}/bll.jar %{engine_ear}/lib diff --git a/packaging/manual/DocumentationPath.csv b/packaging/manual/DocumentationPath.csv new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/packaging/manual/DocumentationPath.csv diff --git a/packaging/manual/UserPortalDocumentationPath.csv b/packaging/manual/UserPortalDocumentationPath.csv new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/packaging/manual/UserPortalDocumentationPath.csv diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in b/packaging/services/ovirt-engine/ovirt-engine.conf.in index 30a760c..c199ced 100644 --- a/packaging/services/ovirt-engine/ovirt-engine.conf.in +++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in @@ -36,7 +36,7 @@ SPICE_DIR="@SPICE_DIR@" ENGINE_NOVNC_DIR="/usr/share/novnc" ENGINE_SPICE_HTML5_DIR="/usr/share/spice-html5" -ENGINE_MANUAL="${ENGINE_DOC}/manual" +ENGINE_MANUAL="${ENGINE_USR}/manual" # # A file created on init and removed on orderly shutdown -- To view, visit http://gerrit.ovirt.org/19552 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00c6a0a554bf684c38f7db21fcbf31621996a0bd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
