From aae71d04bf042ac20f9027a43f5b269a6f7c19fc Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 8 Oct 2012 16:23:09 -0700
Subject: Add the ability to have a 'private' release number which can be to
 increment cloud-init while still maintaining the 'major' cloud-init version
 number from bzr.

---
 packages/brpm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/brpm b/packages/brpm
index 7975e05c..fec6acd8 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -106,6 +106,8 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn):
     subs['version'] = version
     subs['revno'] = revno
     subs['release'] = "bzr%s" % (revno)
+    if args.sub_release is not None:
+        subs['release'] += ".%s" % (args.sub_release)
     subs['archive_name'] = arc_fn
 
     cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')]
@@ -175,6 +177,13 @@ def main():
                               " (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=[],
-- 
cgit v1.2.3


From 8b7b89a7aa0e1110ef8eb6ab46160dbc0a646019 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 8 Oct 2012 16:33:43 -0700
Subject: 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                      | 4 +++-
 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
-- 
cgit v1.2.3