Alon Bar-Lev has uploaded a new change for review.
Change subject: core: support local version string
......................................................................
core: support local version string
this will enable to support downstream specific versions regardless of
upstream package version.
Change-Id: I2f876b59ead88eecaa75ae586af04187f86423d1
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M configure.ac
M ovirt-host-deploy.spec.in
M src/ovirt_host_deploy/config.py.in
M src/plugins/ovirt-host-deploy/core/misc.py
4 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy
refs/changes/32/18532/1
diff --git a/configure.ac b/configure.ac
index 31e5d30..b68eb1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,13 @@
)
AC_ARG_WITH(
+ [local-version],
+ [AS_HELP_STRING([--with-local-version], [local version to use])],
+ [LOCAL_VERSION="${withval}"],
+ [LOCAL_VERSION=""]
+)
+
+AC_ARG_WITH(
[maven],
[AS_HELP_STRING([--with-maven], [use maven to build java-sdk
@<:@default=no@:>@])],
,
@@ -145,6 +152,7 @@
AC_SUBST([ovirthostdeployplugindir])
AC_SUBST([ovirthostdeploylibdir])
AC_SUBST([ovirthostdeployinterfacedir])
+AC_SUBST([LOCAL_VERSION])
AC_SUBST([OTOPI_SOURCES])
AM_CONDITIONAL([PYTHON_SYNTAX_CHECK], [test "${enable_python_syntax_check}" =
"yes"])
AM_CONDITIONAL([JAVA_SDK], [test "${enable_java_sdk}" = "yes"])
diff --git a/ovirt-host-deploy.spec.in b/ovirt-host-deploy.spec.in
index d2f8b2e..5ffc2b6 100644
--- a/ovirt-host-deploy.spec.in
+++ b/ovirt-host-deploy.spec.in
@@ -129,6 +129,7 @@
--docdir="%{_docdir}/%{name}-%{version}" \
--disable-python-syntax-check \
--enable-java-sdk \
+ --with-local-version="%{name}-%{version}-%{release}" \
%{?conf}
make %{?_smp_mflags}
diff --git a/src/ovirt_host_deploy/config.py.in
b/src/ovirt_host_deploy/config.py.in
index 6728d5c..3fa1cf7 100644
--- a/src/ovirt_host_deploy/config.py.in
+++ b/src/ovirt_host_deploy/config.py.in
@@ -23,6 +23,7 @@
PACKAGE_NAME = '@PACKAGE_NAME@'
PACKAGE_VERSION = '@PACKAGE_VERSION@'
+LOCAL_VERSION = '@LOCAL_VERSION@'
INTERFACE_VERSION = '@INTERFACE_VERSION@'
diff --git a/src/plugins/ovirt-host-deploy/core/misc.py
b/src/plugins/ovirt-host-deploy/core/misc.py
index 4f7e5ac..ca8c422 100644
--- a/src/plugins/ovirt-host-deploy/core/misc.py
+++ b/src/plugins/ovirt-host-deploy/core/misc.py
@@ -113,9 +113,10 @@
)
def _setup(self):
self.dialog.note(
- text=_('Version: {package}-{version}').format(
+ text=_('Version: {package}-{version} ({local_version})').format(
package=config.PACKAGE_NAME,
version=config.PACKAGE_VERSION,
+ local_version=config.LOCAL_VERSION,
)
)
--
To view, visit http://gerrit.ovirt.org/18532
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f876b59ead88eecaa75ae586af04187f86423d1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-host-deploy
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
