Merge rpm subrelease branch.

1 files changed, 11 insertions, 0 deletions

diff --git a/packages/brpm b/packages/brpm
index 7975e05c..e6b03609 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -106,6 +106,10 @@ 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['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 @@ 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=[],