From: Karel Zak <kzak@redhat.com>
Date: Fri, 29 Jul 2011 14:12:05 +0000 (+0200)
Subject: build-sys: fix git-version-gen for -rc tags
X-Git-Tag: v2.20-rc1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54e10ad15f1c4f1797814758752752a47a8c25db;p=thirdparty%2Futil-linux.git

build-sys: fix git-version-gen for -rc tags

The current version have a problem to support "v2.20-rc1" format of
the tags.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tools/git-version-gen b/tools/git-version-gen
index 686f7031a6..1df20c3bdc 100755
--- a/tools/git-version-gen
+++ b/tools/git-version-gen
@@ -116,6 +116,7 @@ then
     #   Newer: v6.10-77-g0f8faeb
     #   Older: v6.10-g0f8faeb
     case $v in
+        *-rc[0-9]) ;; # release candidate
         *-*-*) : git describe is okay three part flavor ;;
         *-*)
             : git describe is older two part flavor
@@ -132,9 +133,17 @@ then
             ;;
     esac
 
-    # Change the first '-' to a '.', so version-comparing tools work properly.
-    # Remove the "g" in git describe's output string, to save a byte.
-    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    case $v in
+        *-rc[0-9])
+	    # Remove the "g" in git describe's output string, to save a byte.
+            v=`echo "$v" | sed 's/\(.*\)-g/\1-/'`;     
+	    ;;
+        *)
+	    # Change the first '-' to a '.', so version-comparing tools work properly.
+	    # Remove the "g" in git describe's output string, to save a byte.
+	    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+	    ;;
+    esac
     v_from_git=1
 else
     v=UNKNOWN