Stable version

2 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 707f9ce2a84e..71d9c6a5fe60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = vala-panel-appmenu-registrar-git
+pkgbase = vala-panel-appmenu-registrar
 	pkgdesc = Small utility to hold DBusMenu menus
-	pkgver = 0.7.3
+	pkgver = 0.7.6
 	pkgrel = 1
 	url = https://gitlab.com/vala-panel-project/vala-panel-appmenu
 	arch = i686
@@ -8,11 +8,10 @@ pkgbase = vala-panel-appmenu-registrar-git
 	license = LGPL3
 	makedepends = meson
 	makedepends = glib2
-	makedepends = git
 	depends = glib2
-	provides = vala-panel-appmenu-registrar
-	source = git+https://gitlab.com/vala-panel-project/vala-panel-appmenu.git
+	conflicts = vala-panel-appmenu-registrar-git
+	source = git+https://gitlab.com/vala-panel-project/vala-panel-appmenu.git#tag=0.7.6
 	sha256sums = SKIP
 
-pkgname = vala-panel-appmenu-registrar-git
+pkgname = vala-panel-appmenu-registrar
 
diff --git a/PKGBUILD b/PKGBUILD
index 079a4fbf1ff8..8e91d7bae31c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,28 @@
-# Maintainer: rilian-la-te <ria.freelander@gmail.com>
+# Maintainer : Yamada Hayao <hayao@fascode.net>
+# Contributer: rilian-la-te <ria.freelander@gmail.com>
 
-makedepends=('meson' 'glib2' 'git')
+makedepends=('meson' 'glib2')
 
-_pkgbase=vala-panel-appmenu
-pkgname=vala-panel-appmenu-registrar-git
-_path=subprojects/registrar
-pkgver=0.7.3
+_pkgbase="vala-panel-appmenu"
+pkgname="vala-panel-appmenu-registrar"
+_path="subprojects/registrar"
+pkgver=0.7.6
 pkgrel=1
 pkgdesc="Small utility to hold DBusMenu menus"
-provides=(vala-panel-appmenu-registrar)
+conflicts=("vala-panel-appmenu-registrar-git")
 depends=('glib2')
 url="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
 arch=('i686' 'x86_64')
 license=('LGPL3')
 
-source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git")
+source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git#tag=${pkgver}")
 sha256sums=('SKIP')
 
-pkgver() {
-  cd "${srcdir}/${_pkgbase}"
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
-}
-
 build() {
-  meson build "${srcdir}/${_pkgbase}/${_path}" --prefix=/usr --libexecdir=lib
-  meson compile -C build
+    meson build "${srcdir}/${_pkgbase}/${_path}" --prefix=/usr --libexecdir=lib
+    meson compile -C build
 }
 
-package()
-{
-  DESTDIR="$pkgdir" meson install -C build --no-rebuild
+package() {
+    DESTDIR="$pkgdir" meson install -C build --no-rebuild
 }