diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-08 16:33:43 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-08 16:33:43 -0700 |
| commit | 8b7b89a7aa0e1110ef8eb6ab46160dbc0a646019 (patch) | |
| tree | 5f6f6ad6d8b9fd35066feceda146a3a1b34ba27a | |
| parent | aae71d04bf042ac20f9027a43f5b269a6f7c19fc (diff) | |
| download | vyos-cloud-init-8b7b89a7aa0e1110ef8eb6ab46160dbc0a646019.tar.gz vyos-cloud-init-8b7b89a7aa0e1110ef8eb6ab46160dbc0a646019.zip | |
Make the subrelease a new k/v entry that is handled
differently in the rpm spec file template instead
of being joined with the release.
| -rwxr-xr-x | packages/brpm | 4 | ||||
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/brpm b/packages/brpm index fec6acd8..e6b03609 100755 --- a/packages/brpm +++ b/packages/brpm @@ -107,7 +107,9 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn): subs['revno'] = revno subs['release'] = "bzr%s" % (revno) if args.sub_release is not None: - subs['release'] += ".%s" % (args.sub_release) + subs['subrelease'] = "." + str(args.sub_release) + else: + subs['subrelease'] = '' subs['archive_name'] = arc_fn cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')] diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 12f0b144..30bcd050 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -11,7 +11,7 @@ Name: cloud-init Version: ${version} -Release: ${release}%{?dist} +Release: ${release}${subrelease}%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base |