remove tox-vapi, install in offical way

2 files changed, 14 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27fbbfa80ff5..7a74c6552086 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Apr  7 00:18:51 UTC 2016
+# Sun Apr 10 04:40:26 UTC 2016
 pkgbase = ricin-git
-	pkgdesc = Lightweight and Fully-Hackable Tox client powered by Vala & Gtk3
-	pkgver = 0.540.62bb688
+	pkgdesc = A dead-simple but powerful Tox client.
+	pkgver = 0.563.0897e51
 	pkgrel = 1
 	url = https://github.com/RicinApp/Ricin
 	arch = i686
@@ -22,8 +22,6 @@ pkgbase = ricin-git
 	provides = ricin
 	conflicts = ricin
 	source = git+https://github.com/RicinApp/Ricin.git
-	source = git+https://github.com/RicinApp/tox-vapi.git
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = ricin-git
diff --git a/PKGBUILD b/PKGBUILD
index 0186ef2d0b87..285f04492e31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 pkgname=ricin-git
 _pkgname=Ricin
 _submodule=tox-vapi
-pkgver=0.540.62bb688
+pkgver=0.563.0897e51
 pkgrel=1
-pkgdesc="Lightweight and Fully-Hackable Tox client powered by Vala & Gtk3"
+pkgdesc="A dead-simple but powerful Tox client."
 url="https://github.com/RicinApp/Ricin"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -19,19 +19,11 @@ depends=('gtk3'
          'libconfig'
          )
 
-source=("git+https://github.com/RicinApp/Ricin.git"
-        "git+https://github.com/RicinApp/tox-vapi.git")
-sha256sums=('SKIP' 'SKIP')
+source=("git+https://github.com/RicinApp/Ricin.git")
+sha256sums=('SKIP')
 provides=('ricin')
 conflicts=('ricin')
 
-prepare() {
-    cd "${srcdir}/${_pkgname}"
-    git submodule init
-    git config submodule.${_submodule}.url $srcdir/${_submodule}
-    git submodule update
-}
-
 pkgver() {
     cd "${srcdir}/${_pkgname}"
     echo "0.$(git rev-list --count HEAD).$(git describe --always)"
@@ -39,19 +31,18 @@ pkgver() {
 
 build() {
     cd "${srcdir}/${_pkgname}"
-    mkdir build || true
-    if [ -f "/usr/bin/meson" ]; then
-        meson . build
-    else
-        meson.py . build
-    fi
+
+    make autogen
     make release
+
+    cd build
+    mesonconf.py -Dprefix=/usr
 }
 
 package() {
     cd "${srcdir}/${_pkgname}"
 
-    install -Dm644 "icons/Ricin-128x128.png" "${pkgdir}/usr/share/icons/icons/Ricin-128x128.png"
-    install -Dm644 "ricin.desktop" "${pkgdir}/usr/share/applications/ricin.desktop"
+    make DESTDIR=$pkgdir install
+    # cover ${pkgdir}/usr/bin/Ricin"
     install -Dm755 "build/${_pkgname}" "${pkgdir}/usr/bin/ricin"
 }