cleaning up dependancies, and removed -j from make commands

2 files changed, 15 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eeea0579b51b..b0b2d9b1ea4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 # Generated by mksrcinfo v8
-# Tue Apr 12 15:46:20 UTC 2016
+# Sun Apr 17 00:09:36 UTC 2016
 pkgbase = octopi
 	pkgdesc = a powerful Pacman frontend using Qt libs
 	pkgver = 0.8.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://octopiproject.wordpress.com
 	install = octopi.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = qt5-declarative
-	makedepends = knotifications
-	makedepends = libnotify
 	source = https://github.com/aarnt/octopi/archive/v0.8.1.tar.gz
 	source = octopi-repoeditor.desktop
 	source = enable-kstatus.patch
@@ -23,7 +21,7 @@ pkgname = octopi
 	pkgdesc = A powerful Pacman frontend using Qt5 libs
 	install = octopi.install
 	depends = qt5-declarative
-	depends = xterm
+	optdepends = xterm: for AUR support
 	optdepends = kdesu: for KDE
 	optdepends = gksu: for XFCE, Gnome, LXDE, Cinnamon
 	optdepends = lxqt-sudo: for LXQT
@@ -43,6 +41,7 @@ pkgname = octopi-notifier
 	install = octopi.install
 	depends = octopi
 	depends = libnotify
+	depends = knotifications
 	optdepends = xfce4-notifyd: for notifications in XFCE
 	conflicts = octopi-notifier-qt4
 	conflicts = octopi-notifier-kde
diff --git a/PKGBUILD b/PKGBUILD
index 6d74a002a1bc..da884491a929 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 pkgbase=octopi
 pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="a powerful Pacman frontend using Qt libs"
 arch=('i686' 'x86_64')
 url="http://octopiproject.wordpress.com"
 license=('GPL2')
 install=$pkgname.install
-makedepends=('qt5-declarative' 'knotifications' 'libnotify')
+makedepends=('qt5-declarative')
 source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
 	'octopi-repoeditor.desktop'
 	'enable-kstatus.patch')
@@ -18,9 +18,6 @@ sha256sums=('e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e'
             '288dd58a8aa98ef5ad901aec600d0a3c36fa81b60d51385bceeadec0c1aa7b01')
 
 prepare() {
-	_cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
-	_jc=$((${_cpucount:-1}))
-   
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
   
@@ -31,34 +28,35 @@ build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	qmake-qt5 octopi.pro
-	make -j $_jc
+	make
 
 	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper"
 	msg "Building pacmanhelper..."
 	qmake-qt5 pacmanhelper.pro
-	make -j $_jc
+	make
 
 	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier"
 	msg "Building octopi-notifier..."
 	qmake-qt5 octopi-notifier.pro
-	make -j $_jc
+	make
   
 	cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor"
 	msg "Building octopi-repoeditor..."
 	qmake-qt5 octopi-repoeditor.pro
-	make -j $_jc
+	make
 
 	cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner"
 	msg "Building octopi-cachecleaner..."
 	qmake-qt5 octopi-cachecleaner.pro
-	make -j $_jc
+	make
 }
 
 package_octopi() {
 	pkgdesc="A powerful Pacman frontend using Qt5 libs"
 	install=octopi.install
-	depends=('qt5-declarative' 'xterm')
-	optdepends=('kdesu: for KDE'
+	depends=('qt5-declarative')
+	optdepends=('xterm: for AUR support'
+				'kdesu: for KDE'
 		    'gksu: for XFCE, Gnome, LXDE, Cinnamon'
 				'lxqt-sudo: for LXQT'
 		    'gnome-keyring: for password management'
@@ -95,7 +93,7 @@ package_octopi() {
 
 package_octopi-notifier() {
 	pkgdesc="Notifier for Octopi"
-	depends=('octopi' 'libnotify')
+	depends=('octopi' 'libnotify' 'knotifications')
 	optdepends=('xfce4-notifyd: for notifications in XFCE')
 	install=octopi.install
 	conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde' 'octopi-notifier-kde4')