Adjusting pkgver; metainfo

3 files changed, 36 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 031a26112daa..80807c2ab726 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 # Generated by mksrcinfo v8
-# Wed Dec 21 23:49:45 UTC 2016
+# Thu Dec 22 02:02:48 UTC 2016
 pkgbase = artwork-maia
-	pkgver = 64980da
+	pkgver = r221
 	pkgrel = 1
-	url = https://github.com/manjaro/artwork-maia/
+	url = https://github.com/manjaro/artwork-maia
 	arch = any
-	license = LGPL
+	license = GPL2
 	makedepends = phonon-qt5-gstreamer
 	makedepends = extra-cmake-modules
 	makedepends = plasma-framework
-	source = https://github.com/manjaro/artwork-maia//archive/64980da6c31836c7679dd0b02e52644aa7f4e007.tar.gz
-	sha256sums = 1b5798a8e71a81d238d714bc44987fccdc42b97d89664796810e27212658eab2
+	makedepends = git
+	source = git+https://github.com/manjaro/artwork-maia.git
+	sha256sums = SKIP
 
 pkgname = artwork-maia
 	pkgdesc = Maia artwork meta-package
diff --git a/.gitignore b/.gitignore
index 726c2a3b89d2..2bc9a6adb43f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 pkg
 src
 *.gz
-
+artwork-maia
diff --git a/PKGBUILD b/PKGBUILD
index ab2fdf270bc2..f1d9a977ce0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,27 @@
 pkgbase=artwork-maia
 pkgname=('artwork-maia' 'maia-icon-theme' 'plasma5-themes-maia' 'sddm-maia-theme' 'maia-wallpaper')
 pkgrel=1
-_gitcommit=64980da6c31836c7679dd0b02e52644aa7f4e007
-pkgver=$(echo ${_gitcommit} | cut -c1-7)
-url='https://github.com/manjaro/artwork-maia/'
+pkgver=r221
+url='https://github.com/manjaro/artwork-maia'
 arch=('any')
-license=('LGPL')
-makedepends=('phonon-qt5-gstreamer' 'extra-cmake-modules' 'plasma-framework')
+license=('GPL2')
+makedepends=('phonon-qt5-gstreamer' 'extra-cmake-modules' 'plasma-framework' 'git')
+source=("git+$url.git")
+sha256sums=('SKIP')
 
-source=("$url/archive/$_gitcommit.tar.gz")
-sha256sums=('1b5798a8e71a81d238d714bc44987fccdc42b97d89664796810e27212658eab2')
+pkgver() {
+  cd ${srcdir}/${pkgbase}
+  _REV=$(git rev-list --count master)
+  printf "r${_REV}"
+}
 
 prepare() {
-  mv $srcdir/artwork-maia-$_gitcommit $srcdir/maia
   mkdir -p build
 }
 
 build() {
   cd build
-  cmake ../maia \
+  cmake ../$pkgbase \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
@@ -31,6 +34,15 @@ build() {
 package_artwork-maia() {
   pkgdesc="Maia artwork meta-package"
   depends=('maia-icon-theme' 'maia-wallpaper' 'plasma5-themes-maia' 'sddm-maia-theme')
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share/icons"
+  rm -rf "${pkgdir}/usr/share/color-schemes"
+  rm -rf "${pkgdir}/usr/share/kservices5"
+  rm -rf "${pkgdir}/usr/share/plasma"
+  rm -rf "${pkgdir}/usr/share/sddm"
+  rm -rf "${pkgdir}/usr/share/wallpapers"
 }
 
 package_maia-wallpaper() {
@@ -46,17 +58,20 @@ package_maia-wallpaper() {
   rm -rf "${pkgdir}/usr/share/plasma"
   rm -rf "${pkgdir}/usr/share/sddm"
   rm -rf "${pkgdir}/usr/share/wallpapers"
+  rm -rf "${pkgdir}/usr/share/metainfo"
 }
 
 package_maia-icon-theme() {
   pkgdesc='Maia icon theme'
   cd build
   make DESTDIR="${pkgdir}" install
+
   rm -rf "${pkgdir}/usr/share/color-schemes"
   rm -rf "${pkgdir}/usr/share/kservices5"
   rm -rf "${pkgdir}/usr/share/plasma"
   rm -rf "${pkgdir}/usr/share/sddm"
   rm -rf "${pkgdir}/usr/share/wallpapers"
+  rm -rf "${pkgdir}/usr/share/metainfo"
 }
 
 package_plasma5-themes-maia() {
@@ -65,17 +80,21 @@ package_plasma5-themes-maia() {
   replaces=('maia-themes')
   cd build
   make DESTDIR="${pkgdir}" install
+
   rm -rf "${pkgdir}/usr/share/sddm"
   rm -rf "${pkgdir}/usr/share/icons"
+  rm -rf "${pkgdir}/usr/share/metainfo"
 }
 
 package_sddm-maia-theme() {
   pkgdesc="Maia theme for SDDM"
   cd build
   make DESTDIR="${pkgdir}" install
+
   rm -rf "${pkgdir}/usr/share/color-schemes"
   rm -rf "${pkgdir}/usr/share/icons"
   rm -rf "${pkgdir}/usr/share/kservices5"
   rm -rf "${pkgdir}/usr/share/plasma"
   rm -rf "${pkgdir}/usr/share/wallpapers"
+  rm -rf "${pkgdir}/usr/share/metainfo"
 }