build and export: conform to new API of git-buildpackage

Command line option names and the SpecFile class have changed a bit.

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

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index e548dcc..dec3830 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -382,11 +382,11 @@ def do(opts, args):
         try:
             if gbp_build(["argv[0] placeholder", "--git-export-only",
                           "--git-ignore-new", "--git-builder=osc",
-                          "--git-no-auto-patch-gen",
+                          "--git-no-patch-export",
                           "--git-upstream-tree=%s" % commit,
                           "--git-export-dir=%s" % export_dir,
                           "--git-packaging-dir=packaging",
-                          "--git-specfile=%s" % relative_spec,
+                          "--git-spec-file=%s" % relative_spec,
                           "--git-export=%s" % commit]):
                 msger.error("Failed to get packaging info from git tree")
         except GitRepositoryError, excobj:

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index 862d2a9..0752b60 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -99,7 +99,7 @@ def do(opts, args):
                           "--git-upstream-tree=%s" % commit,
                           "--git-export-dir=%s" % export_dir,
                           "--git-packaging-dir=packaging",
-                          "--git-specfile=%s" % relative_spec,
+                          "--git-spec-file=%s" % relative_spec,
                           "--git-export=%s" % commit]):
                 msger.error("Failed to get packaging info from git tree")
         except GitRepositoryError, excobj:
@@ -113,7 +113,7 @@ def do(opts, args):
     if not spec.name or not spec.version:
         msger.error('can\'t get correct name or version from spec file.')
     else:
-        outdir = "%s/%s-%s-%s" % (outdir, spec.name, spec.version, spec.release)
+        outdir = "%s/%s-%s-%s" % (outdir, spec.name, spec.upstreamversion, spec.release)
         shutil.rmtree(outdir, ignore_errors=True)
         shutil.move(export_dir, outdir)
 

diff --git a/gitbuildsys/cmd_remotebuild.py b/gitbuildsys/cmd_remotebuild.py
index 9fd2211..d87fa9d 100644 (file)
--- a/gitbuildsys/cmd_remotebuild.py
+++ b/gitbuildsys/cmd_remotebuild.py
@@ -209,7 +209,7 @@ def do(opts, args):
                           "--git-upstream-tree=%s" % commit,
                           "--git-export-dir=%s" % tmpdir,
                           "--git-packaging-dir=packaging",
-                          "--git-specfile=%s" % relative_spec,
+                          "--git-spec-file=%s" % relative_spec,
                           "--git-export=%s" % commit]):
                 msger.error("Failed to get packaging info from git tree")
         except GitRepositoryError, excobj: