[Kimchi-devel] [PATCH 1/2] Update Kimchi tag to remove 'kimchi-' prefix

[alinefm at linux.vnet.ibm.com]

From: Aline Manera <alinefm at linux.vnet.ibm.com>

As the tags on Kimchi repository is only related to it, we don't need to
prefix it witk 'kimchi-'

Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
 build-aux/pkg-version | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/build-aux/pkg-version b/build-aux/pkg-version
index 5e3e333..749cf6c 100755
--- a/build-aux/pkg-version
+++ b/build-aux/pkg-version
@@ -17,25 +17,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 # tags and output versions:
-#   - kimchi-4.9.0   => 4.9.0 (upstream clean)
-#   - kimchi-4.9.0-1 => 4.9.0 (downstream clean)
-#   - kimchi-4.9.0-2-g34e62f   => 4.9.0 (upstream dirty)
-#   - kimchi-4.9.0-1-2-g34e62f => 4.9.0 (downstream dirty)
+#   - 4.9.0   => 4.9.0 (upstream clean)
+#   - 4.9.0-1 => 4.9.0 (downstream clean)
+#   - 4.9.0-2-g34e62f   => 4.9.0 (upstream dirty)
+#   - 4.9.0-1-2-g34e62f => 4.9.0 (downstream dirty)
 AWK_VERSION='
     BEGIN { FS="-" }
-    /^kimchi-[0-9]/ {
-      sub(/^kimchi-/,"") ; print $1
+    /^[0-9]/ {
+      print $1
     }'
 
 # tags and output releases:
-#   - kimchi-4.9.0   => 0 (upstream clean)
-#   - kimchi-4.9.0-1 => 1 (downstream clean)
-#   - kimchi-4.9.0-2-g34e62f1   => 2.git34e62f1 (upstream dirty)
-#   - kimchi-4.9.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty)
+#   - 4.9.0   => 0 (upstream clean)
+#   - 4.9.0-1 => 1 (downstream clean)
+#   - 4.9.0-2-g34e62f1   => 2.git34e62f1 (upstream dirty)
+#   - 4.9.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty)
 AWK_RELEASE='
     BEGIN { FS="-"; OFS="." }
-    /^kimchi-[0-9]/ {
-      sub(/^kimchi-/,"")
+    /^[0-9]/ {
       if (NF == 1) print 0
       else if (NF == 2) print $2
       else if (NF == 3) print $2, "git" substr($3, 2)
@@ -45,7 +44,7 @@ AWK_RELEASE='
 if [ ! -d .git ]; then
     PKG_VERSION=`cat VERSION`
 else
-    PKG_VERSION=`git describe --tags --match "kimchi-[0-9]*" || cat VERSION`
+    PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION`
 fi
 
 if test "x$1" = "x--full"; then
-- 
1.9.3