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: I9b0e691dbbe25e1a26390dd46b93907ec8e65259 Signed-off-by: Alon Bar-Lev <[email protected]> --- M configure.ac M otopi.spec.in M src/otopi/config.py.in.in M src/plugins/otopi/core/misc.py 4 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/otopi refs/changes/31/18531/1 diff --git a/configure.ac b/configure.ac index 610c658..209ff50 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,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@:>@])], , @@ -125,6 +132,7 @@ otopiplugindir="\$(pkgdatadir)/plugins" AC_SUBST([otopilibdir]) AC_SUBST([otopiplugindir]) +AC_SUBST([LOCAL_VERSION]) AM_CONDITIONAL([PYTHON_SYNTAX_CHECK], [test "${enable_python_syntax_check}" = "yes"]) AM_CONDITIONAL([JAVA_SDK], [test "${enable_java_sdk}" = "yes"]) AM_CONDITIONAL([JAVA_SDK_COMPILE], [test "${enable_java_sdk_compile}" = "yes"]) diff --git a/otopi.spec.in b/otopi.spec.in index 3fbe0ba..0e13c05 100644 --- a/otopi.spec.in +++ b/otopi.spec.in @@ -135,6 +135,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/otopi/config.py.in.in b/src/otopi/config.py.in.in index 243fa6e..7b18eab 100644 --- a/src/otopi/config.py.in.in +++ b/src/otopi/config.py.in.in @@ -20,6 +20,7 @@ PACKAGE_NAME = '@PACKAGE_NAME@' PACKAGE_VERSION = '@PACKAGE_VERSION@' +LOCAL_VERSION = '@LOCAL_VERSION@' BOOTSTRAP_INTERFACE_VERSION = '@BOOTSTRAP_INTERFACE_VERSION@' otopiplugindir = '@otopiplugindir_POST@' diff --git a/src/plugins/otopi/core/misc.py b/src/plugins/otopi/core/misc.py index 02268c0..fd55af7 100644 --- a/src/plugins/otopi/core/misc.py +++ b/src/plugins/otopi/core/misc.py @@ -62,9 +62,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/18531 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b0e691dbbe25e1a26390dd46b93907ec8e65259 Gerrit-PatchSet: 1 Gerrit-Project: otopi Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
