Use commit sha1 instead of tagname in spec file VCS tag

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

diff --git a/debian/control b/debian/control
index 27177b3c8dea69be32fb003c3253dbdad2b1b7f5..fe7960c565c4ef45980bb15f7e06d5697767e6eb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Depends: ${misc:Depends}, ${python:Depends},
  python-pycurl,
  sudo,
  osc (>= 0.139.0),
- git-buildpackage-rpm (>= 0.6.3-tizen20131016),
+ git-buildpackage-rpm (>= 0.6.3-tizen20131017),
  gbs-api (= ${binary:Version}),
  gbs-export (= ${binary:Version}),
  gbs-remotebuild (= ${binary:Version}),

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index b88990ba79f51b671a74d884e6647c7ec419f7ad..44c635466e92a1150eb88609e4c50c036b7e9fa3 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -141,7 +141,7 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args,
             "--git-export=%s" % commit,
             "--git-upstream-branch=%s" % upstream_branch,
             "--git-upstream-tag=%s" % upstream_tag,
-            "--git-spec-vcs-tag=%s#%%(tagname)s" % reponame]
+            "--git-spec-vcs-tag=%s#%%(commit)s" % reponame]
 
     if create_tarball:
         argv.append("--git-force-create")

diff --git a/packaging/gbs.spec b/packaging/gbs.spec
index 05db3900acd77b730a12aa266d497380bd563401..6532e6801857ecfb719ca1b15ff1b571a98f9c19 100644 (file)
--- a/packaging/gbs.spec
+++ b/packaging/gbs.spec
@@ -13,7 +13,7 @@ Requires:   python >= 2.6
 Requires:   python-pycurl
 Requires:   sudo
 Requires:   osc >= 0.139.0
-Requires:   tizen-gbp-rpm >= 20131016
+Requires:   tizen-gbp-rpm >= 20131017
 Requires:   depanneur >= 0.10
 Requires:   mic >= 0.20