updated to last commit, enhanced install and versioning, added provides/conflicts/replace/license

2 files changed, 20 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c5e17eb0f2f..7c41d25e24cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = purple-discord-git
 	pkgdesc = A purple-based (Pidgin) plugin for Discord.
-	pkgver = v0.0.r0.gb17303a
+	pkgver = v0.0.r190.22f49ce
 	pkgrel = 1
 	url = https://github.com/EionRobb/purple-discord
 	arch = i686
@@ -9,6 +9,9 @@ pkgbase = purple-discord-git
 	makedepends = git
 	depends = libpurple
 	depends = json-glib
+	provides = purple-discord
+	conflicts = purple-discord
+	replaces = purple-discord
 	source = pidgin-discord::git+https://github.com/EionRobb/purple-discord.git
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f2c6fcfe969e..744dc5c147eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,9 @@
 # Contributor: kaptoxic
 
 pkgname=purple-discord-git
-pkgver=v0.0.r0.gb17303a
+pkgver=v0.0.r190.22f49ce
+_pkgver=v0.0.
+_pkgdir=pidgin-discord
 pkgrel=1
 pkgdesc="A purple-based (Pidgin) plugin for Discord."
 url='https://github.com/EionRobb/purple-discord'
@@ -10,21 +12,26 @@ arch=('i686' 'x86_64')
 license=('GPL3')
 makedepends=('git')
 depends=('libpurple' 'json-glib')
+replaces=('purple-discord')
+provides=('purple-discord')
+conflicts=('purple-discord')
 source=('pidgin-discord::git+https://github.com/EionRobb/purple-discord.git')
 sha512sums=('SKIP')
 
+pkgver() {
+  cd "$srcdir/${_pkgdir}/"
+  printf "${_pkgver}r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 build() {
-  cd "$srcdir/pidgin-discord/"
+  cd "$srcdir/${_pkgdir}/"
   make
 }
 
 package() {
-  cd "$srcdir/pidgin-discord/"
-  #installing purple plugin
-  install -Dm755 libdiscord.so "$pkgdir/usr/lib/purple-2/libdiscord.so"
-  #installing icons
-  install -Dm644 discord16.png "$pkgdir/usr/share/pixmaps/pidgin/protocols/16/discord.png"
-  install -Dm644 discord22.png "$pkgdir/usr/share/pixmaps/pidgin/protocols/22/discord.png"
-  install -Dm644 discord48.png "$pkgdir/usr/share/pixmaps/pidgin/protocols/48/discord.png"
+  cd "$srcdir/${_pkgdir}/"
+  make DESTDIR="$pkgdir" install
+  #installing license
+  install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }