fix: package build as recomended from package comments

2 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5952f2086f8..887cfa7dadbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,16 +10,15 @@ pkgbase = alphaplot-git
 	makedepends = boost
 	makedepends = cmake
 	makedepends = qt5-tools
+	makedepends = glu
 	depends = gsl
-	depends = mesa
-	depends = shared-mime-info
 	depends = hicolor-icon-theme
 	depends = qt5-datavis3d
 	depends = qt5-script
-	depends = qt5-xmlpatterns
 	depends = qt5-svg
+	provides = alphaplot
+	conflicts = alphaplot
 	source = alphaplot-git::git+https://github.com/narunlifescience/AlphaPlot.git/#branch=master
 	sha512sums = SKIP
 
 pkgname = alphaplot-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6fc07f76f241..b74e738c94fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
 
 pkgname=alphaplot-git
-pkgver=r1077.5e8bc859
+pkgver=r1244.da97d1f
 pkgrel=1
 pkgdesc="Application for Scientific Data Analysis and Visualization, fork of SciDavis / QtiPlot git version"
 url='http://alphaplot.sourceforge.net/'
@@ -9,31 +9,33 @@ arch=('i686' 'x86_64')
 license=('GPL2')
 
 # make dependancies
-makedepends=('boost' 'cmake' 'qt5-tools')
-depends=('gsl' 'mesa' 'shared-mime-info' 'hicolor-icon-theme' 'qt5-datavis3d' 'qt5-script' 'qt5-xmlpatterns' 'qt5-svg')
+makedepends=('boost' 'cmake' 'qt5-tools' 'glu')
+depends=('gsl' 'hicolor-icon-theme' 'qt5-datavis3d' 'qt5-script' 'qt5-svg')
 
 # source download from git repo & prepare
 source=("$pkgname::git+https://github.com/narunlifescience/AlphaPlot.git/#branch=master")
 install=${pkgname}.install
 sha512sums=('SKIP')
+provides=('alphaplot')
+conflicts=('alphaplot')
 
 pkgver() {
-	cd "${srcdir}/${pkgname}"
-	( set -o pipefail
-	  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-	  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	)
+  cd "$pkgname"
+  ( set -o pipefail
+    git describe --long --abbrev=7 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
 # start building
 build() {
   cd "${srcdir}/${pkgname}"
   qmake
-  make -j
+  make
 }
 
 # prepare package
 package() {
   cd "${srcdir}/${pkgname}"
   make INSTALL_ROOT="${pkgdir}" DESTDIR="${pkgdir}" install
-} 
+}