reorganize build process

2 files changed, 19 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 826e16dcd1c3..1a381203b1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,18 @@
 # Generated by mksrcinfo v8
-# Mon Feb 27 16:41:41 UTC 2017
+# Tue Feb 28 19:56:09 UTC 2017
 pkgbase = gridcoinresearch-qt
-	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC
+	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC - Qt
 	pkgver = 3.5.8.6
-	pkgrel = 2
+	pkgrel = 4
 	url = http://gridcoin.us
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = custom:gridcoin
 	makedepends = boost
-	makedepends = qt5-base
 	makedepends = qt5-tools
-	makedepends = openssl
-	makedepends = libzip
 	makedepends = qrencode
 	makedepends = db
-	makedepends = curl
-	makedepends = miniupnpc
-	source = gridcoinresearch-3.5.8.6.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/3.5.8.6.tar.gz
-	source = gridcoinresearch-qt.desktop
-	sha256sums = d798ea60f87d4daf78c154dde650f0cb08cc28cc34fa8ee876c2e37948efb393
-	sha256sums = 1c547e531726d3172895683f9673379fc51639689989e49494aa0f40fc6cb053
-
-pkgname = gridcoinresearch-qt
-	pkgdesc = GridCoin is a cryptocurrency that helps science via BOINC - Qt
-	install = gridcoin.install
 	depends = boost-libs
 	depends = qrencode
 	depends = qt5-base
@@ -33,4 +20,10 @@ pkgname = gridcoinresearch-qt
 	depends = miniupnpc
 	depends = curl
 	depends = boinc
+	source = gridcoinresearch-3.5.8.6.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/3.5.8.6.tar.gz
+	source = gridcoinresearch-qt.desktop
+	sha256sums = d798ea60f87d4daf78c154dde650f0cb08cc28cc34fa8ee876c2e37948efb393
+	sha256sums = 1c547e531726d3172895683f9673379fc51639689989e49494aa0f40fc6cb053
+
+pkgname = gridcoinresearch-qt
 
diff --git a/PKGBUILD b/PKGBUILD
index eea38a5b85e0..17197f415148 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Albert Mikaelyan <tahvok at gmail dot com>
 
-pkgname=('gridcoinresearch-qt')
+pkgname=gridcoinresearch-qt
 pkgver=3.5.8.6
-pkgrel=3
-pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC"
+pkgrel=4
+pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC - Qt"
+depends=('boost-libs' 'qrencode' 'qt5-base' 'libzip' 'miniupnpc' 'curl' 'boinc')
+makedepends=('boost' 'qt5-tools' 'qrencode' 'db')
+
 arch=('i686' 'x86_64' 'armv7h')
 url="http://gridcoin.us"
 license=('custom:gridcoin')
 
 _sourcename="Gridcoin-Research-$pkgver"
 
-makedepends=('boost' 'qt5-base' 'qt5-tools' 'openssl' 'libzip' 'qrencode' 'db' 'curl' 'miniupnpc')
-
 source=("gridcoinresearch-${pkgver}.tar.gz::https://github.com/gridcoin/Gridcoin-Research/archive/${pkgver}.tar.gz"
         'gridcoinresearch-qt.desktop')
 
@@ -21,22 +22,16 @@ sha256sums=('d798ea60f87d4daf78c154dde650f0cb08cc28cc34fa8ee876c2e37948efb393'
 build() {
   cd "$srcdir/$_sourcename"
 
-  qmake "USE_QRCODE=1" "USE_UPNP=1" "NO_UPGRADE=1"
-  make ${MAKEFLAGS}
+  qmake USE_QRCODE=1 USE_UPNP=1 NO_UPGRADE=1
+  make
 }
 
-package_gridcoinresearch-qt() {
-  pkgdesc="GridCoin is a cryptocurrency that helps science via BOINC - Qt"
-  depends=('boost-libs' 'qrencode' 'qt5-base' 'libzip' 'miniupnpc' 'curl' 'boinc')
-  install=gridcoin.install
-
+package() {
   cd "$srcdir/$_sourcename"
-  install -Dm755 gridcoinresearch "$pkgdir/usr/bin/gridcoinresearch"
 
+  install -Dm755 gridcoinresearch "$pkgdir/usr/bin/gridcoinresearch"
   install -Dm644 "${srcdir}/gridcoinresearch-qt.desktop" "$pkgdir/usr/share/applications/gridcoinresearch-qt.desktop"
-
   install -Dm644 share/pixmaps/grc-small.png "$pkgdir/usr/share/pixmaps/grc-small.png"
-
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }