From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 12 Jan 2012 13:45:06 +0000 (+0200)
Subject: rpm: add 'vendor' config option
X-Git-Tag: debian/0.6.26~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc39f361a853fc307bd4cee3576a314c99e4b549;p=tools%2Fgit-buildpackage.git

rpm: add 'vendor' config option

Intended to represent the distribution vendor (e.g. 'Debian'). This can
be used in tag and branch name formatting.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Conflicts:
	gbp/scripts/buildpackage_rpm.py
	gbp/scripts/import_orig_rpm.py
	gbp/scripts/pq_rpm.py
---

diff --git a/gbp/scripts/import_orig_rpm.py b/gbp/scripts/import_orig_rpm.py
index b1247f1e..0dd7c013 100755
--- a/gbp/scripts/import_orig_rpm.py
+++ b/gbp/scripts/import_orig_rpm.py
@@ -299,8 +299,12 @@ def main(argv):
                 gbp.log.info("Pristine-tar: commiting %s" % pristine_orig)
                 repo.pristine_tar.commit(pristine_orig, options.upstream_branch)
 
+<<<<<<< HEAD
             tag_str_fields = dict(upstreamversion=version, vendor="Upstream")
             tag = repo.version_to_tag(options.upstream_tag, tag_str_fields)
+=======
+            tag = repo.version_to_tag(options.upstream_tag, version, vendor="Upstream")
+>>>>>>> 1a96ba7... rpm: add 'vendor' config option
             repo.create_tag(name=tag,
                             msg="Upstream version %s" % version,
                             commit=commit,
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 09ee9bc0..958185fb 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -640,7 +640,6 @@ def main(argv):
     parser.add_config_file_option(option_name="upstream-tag",
             dest="upstream_tag")
     parser.add_config_file_option(option_name="spec-file", dest="spec_file")
-<<<<<<< HEAD
     parser.add_config_file_option(option_name="packaging-dir",
             dest="packaging_dir")
     parser.add_option("--new-packaging-dir",