Add provides and conflicts to PKGBUILD

2 files changed, 23 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56c08c5bf33c..bca3f5091653 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = qtpass-git
 	pkgdesc = QtPass is a multi-platform GUI for pass, the standard unix password manager
-	pkgver = 1.2.0
-	pkgrel = 2
-	url = https://qtpass.org/
+	pkgver = 1.2.0.r6.f3e89ac2
+	pkgrel = 1
+	url = https://qtpass.org
 	install = qtpass.install
 	arch = x86_64
 	arch = i686
@@ -12,6 +12,8 @@ pkgbase = qtpass-git
 	optdepends = xdg-utils
 	optdepends = git
 	optdepends = pass
+	provides = qtpass
+	conflicts = qtpass
 	source = git://github.com/ijhack/qtpass
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f1a583ba971e..d2faf22b5030 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,38 @@
 # Maintainer: Ivan Semkin (ivan at semkin dot ru)
 # Contributor: realitygaps <realitygaps[at]yahoo[dot]com>
 
+appname=qtpass
 pkgname=qtpass-git
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="QtPass is a multi-platform GUI for pass, the standard unix password manager"
-url="https://qtpass.org/"
+pkgver=1.2.0.r6.f3e89ac2
+pkgrel=1
+pkgdesc='QtPass is a multi-platform GUI for pass, the standard unix password manager'
+url='https://qtpass.org'
 arch=('x86_64' 'i686')
 license=('GPLv3')
 depends=('gnupg')
 makedepends=('qt5-base')
 optdepends=('xdg-utils' 'git' 'pass')
-md5sums=("SKIP")
+provides=('qtpass')
+conflicts=('qtpass')
 install=qtpass.install
-source=("git://github.com/ijhack/qtpass")
+source=('git://github.com/ijhack/qtpass')
+md5sums=('SKIP')
+
+pkgver() {
+  cd $appname
+  echo "$(git describe | sed 's/^v//; s/-/.r/; s/-g/./')"
+}
 
 build() {
-  cd "$srcdir/qtpass"
+  cd "$srcdir/$appname"
   qmake .
   make
 }
 
 package() {
-  install -Dm755 "$srcdir/qtpass/main/qtpass" -t "$pkgdir/usr/bin/"
-  install -Dm644 "$srcdir/qtpass/artwork/icon.png" -t "$pkgdir/usr/share/icons/hicolor/512x512/apps/qtpass.png"
-  install -Dm644 "$srcdir/qtpass/qtpass.desktop" -t "$pkgdir/usr/share/applications/qtpass.desktop"
+  install -Dm755 "$srcdir/$appname/main/qtpass" -t "$pkgdir/usr/bin/"
+  install -Dm644 "$srcdir/$appname/artwork/icon.png" -t "$pkgdir/usr/share/icons/hicolor/512x512/apps/qtpass.png"
+  install -Dm644 "$srcdir/$appname/qtpass.desktop" -t "$pkgdir/usr/share/applications/qtpass.desktop"
 } 
 # vim:set ts=2 sw=2 et: