Update to 2.9.71.r309.g26fed89-1

* Fix dependencies to new KDE names
* Shorten pkgver as per wiki
* Remove unnecessary commands

2 files changed, 18 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 670aee2e4740..5914b875b543 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = amarok-git
-	pkgdesc = The powerful music player for KDE - GIT version
-	pkgver = 2.9.71.r235.gf57a116362
+	pkgdesc = The powerful music player for KDE
+	pkgver = 2.9.71.r309.g26fed89
 	pkgrel = 1
 	url = http://amarok.kde.org
 	arch = i686
@@ -10,15 +10,15 @@ pkgbase = amarok-git
 	license = FDL
 	makedepends = git
 	makedepends = extra-cmake-modules
-	makedepends = kdoctools
-	depends = threadweaver
+	makedepends = kdoctools5
+	depends = threadweaver5
 	depends = qt5-webengine
 	depends = phonon-qt5
 	depends = qt5-declarative
-	depends = kcmutils
-	depends = knewstuff
-	depends = ktexteditor
-	depends = kdnssd
+	depends = kcmutils5
+	depends = knewstuff5
+	depends = ktexteditor5
+	depends = kdnssd5
 	depends = libmariadbclient
 	depends = fftw
 	depends = liblastfm-qt5
diff --git a/PKGBUILD b/PKGBUILD
index eb81c568958b..4a7f77f832b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,21 @@
-# Maintainer: Evert Vorster <evorster-at-gmail-dot-com>
-# Maintainer: Luca Weiss <luca (at) z3ntu (dot) xyz>
+# Maintainer: Rhinoceros <https://aur.archlinux.org/account/rhinoceros>
+# Contributor: Evert Vorster <evorster-at-gmail-dot-com>
+# Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
 # Contributor: Jakub Schmidtke <sjakub-at-gmail-dot-com>
 # Contributor: Maël Kerbiriou <mael.kerbiriou-at-free-dot-fr>
 
 pkgname=amarok-git
-pkgver=2.9.71.r235.gf57a116362
+pkgver=2.9.71.r309.g26fed89
 pkgrel=1
-pkgdesc="The powerful music player for KDE - GIT version"
+pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('threadweaver' 'qt5-webengine' 'phonon-qt5' 'qt5-declarative'
-         'kcmutils' 'knewstuff' 'ktexteditor' 'kdnssd'
+depends=('threadweaver5' 'qt5-webengine' 'phonon-qt5' 'qt5-declarative'
+         'kcmutils5' 'knewstuff5' 'ktexteditor5' 'kdnssd5'
          'libmariadbclient' 'fftw'
          'liblastfm-qt5' 'ffmpeg' 'kirigami2')
-makedepends=('git' 'extra-cmake-modules' 'kdoctools')
+makedepends=('git' 'extra-cmake-modules' 'kdoctools5')
 optdepends=("libgpod: support for Apple iPod audio devices"
             "libmtp: support for portable media devices"
             "loudmouth: backend needed by mp3tunes for syncing"
@@ -28,18 +29,16 @@ sha512sums=('SKIP')
 
 pkgver() {
     cd amarok
-    git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    git describe --long --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    rm -rf build
-    mkdir -p build
+    mkdir build
     cd build
     cmake ../amarok \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_BUILD_TYPE=Release
-
     make
 }