Update to 0.2.100 and finalisation of PKGBUILD refactor.

1 files changed, 11 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ff851d18493..862c075ed207 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,19 @@
 # Maintainer: Xavier (sapphirus at azorium dot net)
 # Original Maintainer: Ossi Saukko <osaukko at gmail dot com>
 
-_pkgbdir=opencubicplayer
-pkgname=ocp
-pkgver=0.2.99
+_pkgbase=ocp
+pkgname=${_pkgbase}
+pkgver=0.2.100
 pkgrel=1
 pkgdesc="Open Cubic Player"
 arch=('i686' 'x86_64')
 url="https://stian.cubic.org/project-ocp.php"
 license=('GPL')
-install=ocp.install
+install=${_pkgbase}.install
+
+conflicts=(${_pkgbase}-git)
+provides=(${_pkgbase}=${pkgver})
 
-conflicts=('ocp-git')
 
 depends=('hicolor-icon-theme'
 	 'libxxf86vm' 
@@ -32,22 +34,22 @@ makedepends=('git'
              'xa'
 	     'desktop-file-utils')
 
-source=(git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver})
+source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver})
 md5sums=('SKIP')
 
 prepare() {
-        cd $_pkgbdir
+        cd $_pkgbase
 	git submodule init
 	git submodule update --init --recursive
 }
 
 build() {
-  	cd $_pkgbdir	
+  	cd $_pkgbase	
 	./configure --prefix=/usr --sysconfdir=/etc --with-unifontdir=/usr/share/fonts/Unifont --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf		
 	make DESTDIR="$pkgdir"
 }
 
 package() {
-	cd $_pkgbdir
+	cd $_pkgbase
 	make DESTDIR="$pkgdir" install
 }