Use spec's release field, plus sha when generating rpmsjonathan/rpm-export-use-release

i.e. the release field is now <release>git<sha>

1 files changed, 6 insertions, 1 deletions

diff --git a/ybd/rpm.py b/ybd/rpm.py
index 38852ee..4165903 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -115,6 +115,9 @@ def generate_spec(dn, stage_dir, metafile, output, name, system):
     if 'version' not in dn['rpm-metadata']:
         app.log(dn, "Cannot generate spec, no version is defined!")
         return False
+    if 'release' not in dn['rpm-metadata']:
+        app.log(dn, "Cannot generate spec, no release is defined!")
+        return False
     with open(metafile, "r") as metafile_f:
         metadata = yaml.safe_load(metafile_f)
 
@@ -138,7 +141,9 @@ def generate_spec(dn, stage_dir, metafile, output, name, system):
         output_f.write('Name: %s\n' % name)
         output_f.write('Summary: %s\n' % description)
         output_f.write('Version: %s\n' % dn['rpm-metadata']['version'])
-        output_f.write('Release: %s\n' % dn['sha'])
+        rel_str = 'Release: {}git{}\n'.format(dn['rpm-metadata']['release'],
+                                              dn['sha'])
+        output_f.write(rel_str)
         output_f.write('License: %s\n' % 'Undetermined')
         output_f.write('Prefix: %s\n' % dn.get('prefix', '/usr'))
         # Add all the main package Provides: