From 88242edea804da93d929c84c7032e73ffbca0975 Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Sun, 17 Feb 2013 15:48:41 +0100
Subject: [PATCH] spec-create: fix version detection of tarballs created via a
 git clone command

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog              | 4 ++++
 plugins/spec-create.in | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31fbea4..cb77da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@ Changes in version 1.16.3 - Christmas Release
   * plugins/spec-create - Silvan Calarco:
     Fix regexp to detect names starting with 'lib' (sample failing case: lilv)
 
+  * plugins/spec-create - Davide Madrisan:
+    Fix package version detection of source tarballs that have been created by
+    'git.create_tarball'.
+
 -------------------------------------------------------------------------------
 
 Changes in version 1.16.2 - Christmas Release
diff --git a/plugins/spec-create.in b/plugins/spec-create.in
index 75a68ad..58fa45b 100644
--- a/plugins/spec-create.in
+++ b/plugins/spec-create.in
@@ -518,6 +518,7 @@ function specfile.create() {
             --destdir="$source_dir" "$2"
 
          spec_source="$2/${git_branch:-master}/$spec_source"
+         pck_tarball="$source_dir/${spec_source##*/}"
       ;;
       http://*|https://*|ftp://*)
          pck_tarball="${2##*/}"
@@ -546,7 +547,7 @@ ${proxy:+--proxy $proxy} ${proxy_user:+--proxy-user $proxy_user} \
       notify.error $"cannot find the package $pck_tarball"
 
    # get the package name from the tarball name
-   [ "$pck_name" ] || pck_name=${3:-`echo $2 | sed -n "\
+   [ "$pck_name" ] || pck_name=${3:-`echo $pck_tarball | sed -n "\
       s/.*\///  # remove directory name, if any
       s/\.[^0-9].*//  # remove trailing stuff (.tar.gz, ...)
       /-[0-9]*/{s/-[0-9].*//p;q}  # <pck_name>-<pck_ver>
@@ -560,7 +561,7 @@ ${proxy:+--proxy $proxy} ${proxy_user:+--proxy-user $proxy_user} \
    [[ "${pck_newver//[0-9\.]/}" ]] &&
       notify.error $"invalid version number"" -- \`$pck_newver'"
 
-   [ "$pck_version" ] || pck_version=${4:-`echo $2 | sed -n "\
+   [ "$pck_version" ] || pck_version=${4:-`echo $pck_tarball | sed -n "\
       /[0-9]/!q  # return nothing if no number is found in the package name
       s,.*/,,  # remove directory name, if any
       s/\.[^0-9].*//  # remove trailing stuff (.tar.gz, ...)