[rygel] build: Enable tagging with rygel-<version>

[Jens Georg <jensgeorg src gnome org>]

commit cabd8653305207dc85552d7461e68ac4985f16c1
Author: Jens Georg <mail jensge org>
Date:   Tue Sep 4 22:19:41 2018 +0200

    build: Enable tagging with rygel-<version>
    
    Fixes #114

 build-aux/git-version-gen | 7 +++++--
 configure.ac              | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 463ad730..885dafb4 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -95,10 +95,13 @@ if test -n "$v"
 then
     : # use $v
 elif test -d .git \
-    && v=`git describe --abbrev=4 --match='${GNOME_TAG_PATTERN}_*' HEAD 2>/dev/null \
+    && v=`git describe --abbrev=4 --match='${GNOME_TAG_PATTERN}*' HEAD 2>/dev/null \
          || git describe --abbrev=4 HEAD 2>/dev/null` \
     && case $v in
         ${GNOME_TAG_PATTERN}_[0-9]*) ;;
+     ${GNOME_TAG_PATTERN}-[0-9]*)
+         v=`echo "$v" | sed "s/-/_/"`;
+         ;;
         *) (exit 1) ;;
        esac
 then
@@ -128,7 +131,7 @@ fi
 
 #v=`echo "$v" |sed 's/^v//'`
 
-v=`echo "$v" | sed "s/${GNOME_TAG_PATTERN}_//" | tr _ .`
+v=`echo "$v" | sed "s/${GNOME_TAG_PATTERN}[_-]//" | tr _- .`
 
 # Don't declare a version "dirty" merely because a time stamp has changed.
 git status > /dev/null 2>&1
diff --git a/configure.ac b/configure.ac
index 1c2313f4..9912de97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.64])
 AC_INIT([Rygel],
-       [m4_esyscmd(GNOME_TAG_PATTERN=RYGEL build-aux/git-version-gen .tarball-version)],
-       [http://bugzilla.gnome.org/enter_bug.cgi?product=Rygel],
+       [m4_esyscmd(GNOME_TAG_PATTERN=rygel build-aux/git-version-gen .tarball-version)],
+       [https://gitlab.gnome.org/GNOME/rygel/issues/new],
        [rygel],
        [http://www.rygel-project.org])
 AC_CONFIG_AUX_DIR([build-aux])