Merge lp:~harlowja/cloud-init/rpm-private-release-num into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

[lp:~harlowja/cloud-init/rpm-private-release-num]

687. By Joshua Harlow on 2012-10-08

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.

[Joshua Harlow (harlowja)]

Tried it out and it seems to work, so since this is a rpm only change I'll commit it.

=== modified file 'packages/brpm'
--- packages/brpm	2012-10-05 18:31:56 +0000
+++ packages/brpm	2012-10-08 23:36:19 +0000
@@ -106,6 +106,10 @@
     subs['version'] = version
     subs['revno'] = revno
     subs['release'] = "bzr%s" % (revno)
+    if args.sub_release is not None:
+        subs['subrelease'] = "." + str(args.sub_release)
+    else:
+        subs['subrelease'] = ''
     subs['archive_name'] = arc_fn
 
     cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')]
@@ -175,6 +179,13 @@
                               " (default: %(default)s)"),
                         default=False,
                         action='store_true')
+    parser.add_argument('-s', "--sub-release", dest="sub_release",
+                        metavar="RELEASE",
+                        help=("a 'internal' release number to concat"
+                              " with the bzr version number to form"
+                              " the final version number"),
+                        type=int,
+                        default=None)
     parser.add_argument("-p", "--patch", dest="patches",
                         help=("include the following patch when building"),
                         default=[],

=== modified file 'packages/redhat/cloud-init.spec.in'
--- packages/redhat/cloud-init.spec.in	2012-09-27 00:03:07 +0000
+++ packages/redhat/cloud-init.spec.in	2012-10-08 23:36:19 +0000
@@ -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