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.

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')]

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