Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: Take package name and yum group from spec ......................................................................
packaging: Take package name and yum group from spec Do not hard-code ENGINE_PACKAGE_NAME and UPGRADE_YUM_GROUP in constants.py. Change-Id: Ibad05b1e0283b0b27fb278a0ba15b3f7e95d747c Signed-off-by: Yedidyah Bar David <[email protected]> --- M Makefile M ovirt-engine.spec.in M packaging/setup/ovirt_engine_setup/config.py.in M packaging/setup/ovirt_engine_setup/constants.py 4 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/25714/1 diff --git a/Makefile b/Makefile index a97a6f0..e0c04d6 100644 --- a/Makefile +++ b/Makefile @@ -148,6 +148,7 @@ -e "s|@RPM_VERSION@|$(RPM_VERSION)|g" \ -e "s|@RPM_RELEASE@|$(RPM_RELEASE)|g" \ -e "s|@PACKAGE_NAME@|$(PACKAGE_NAME)|g" \ + -e "s|@YUM_GROUP@|$(YUM_GROUP)|g" \ -e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ -e "s|@DISPLAY_VERSION@|$(DISPLAY_VERSION)|g" \ -e "s|@JBOSS_HOME@|$(JBOSS_HOME)|g" \ diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 910d71d..98f36c0 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -87,6 +87,8 @@ %global openstack_java_version 3.0.2 +%global yum_group ovirt-engine-3.5 + # Macro to create an user: # # %1 user name @@ -115,6 +117,7 @@ PACKAGE_NAME=%{name} \\\ RPM_VERSION=%{version} \\\ RPM_RELEASE=%{release} \\\ + YUM_GROUP=%{yum_group} \\\ DISPLAY_VERSION=%{version}-%{release} \\\ ENGINE_NAME=%{engine_name} \\\ LOCALSTATE_DIR=%{_localstatedir} \\\ diff --git a/packaging/setup/ovirt_engine_setup/config.py.in b/packaging/setup/ovirt_engine_setup/config.py.in index 5a53ad7..a62480b 100644 --- a/packaging/setup/ovirt_engine_setup/config.py.in +++ b/packaging/setup/ovirt_engine_setup/config.py.in @@ -34,6 +34,7 @@ DISPLAY_VERSION = '@DISPLAY_VERSION@' RPM_VERSION = '@RPM_VERSION@' RPM_RELEASE = '@RPM_RELEASE@' +YUM_GROUP = '@YUM_GROUP@' # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index ee8d23d..8ce22d2 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -596,9 +596,9 @@ ENGINE_URI, ) - ENGINE_PACKAGE_NAME = 'ovirt-engine' + ENGINE_PACKAGE_NAME = config.PACKAGE_NAME ENGINE_PACKAGE_SETUP_NAME = '%s-setup' % ENGINE_PACKAGE_NAME - UPGRADE_YUM_GROUP = 'ovirt-engine-3.4' + UPGRADE_YUM_GROUP = config.YUM_GROUP @classproperty def RPM_LOCK_LIST(self): -- To view, visit http://gerrit.ovirt.org/25714 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibad05b1e0283b0b27fb278a0ba15b3f7e95d747c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
