New version

2 files changed, 23 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 562812471d8a..deecbf608f67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = octopi-dev
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = qt5-declarative
 	makedepends = clang
 	makedepends = qt5-tools
 	depends = qt5-base
@@ -16,18 +15,16 @@ pkgbase = octopi-dev
 	depends = qtermwidget
 	optdepends = octopi-notifier-qt5: Notifier for Octopi using Qt5 libs
 	optdepends = octopi-notifier-frameworks: Notifier for Octopi with Knotifications support
-	optdepends = gist: for SysInfo report
 	optdepends = pacaur: for AUR support
-	optdepends = trizen: for AUR support
 	optdepends = pikaur: for AUR support
+	optdepends = trizen: for AUR support
 	optdepends = yay: for AUR support
+	optdepends = gist: for SysInfo report
 	optdepends = pacmanlogviewer: to view pacman log files
 	provides = octopi
 	provides = octopi-repoeditor
 	provides = octopi-cachecleaner
-	conflicts = octopi-git
-	conflicts = octopi-kde-git
-	conflicts = octopi-notifier-noknotify
+	conflicts = octopi
 	source = octopi-0.9.0-2.tar.gz::https://github.com/aarnt/octopi/archive/31060ae2b2f7c496c95b2262b8219c39b65e45be.tar.gz
 	sha256sums = 2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c
 
diff --git a/PKGBUILD b/PKGBUILD
index f73d0827d45a..baff7cf472f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: MatMoul <matmoul@gmail.com>
 
 pkgbase=octopi-dev
-pkgname=('octopi-dev')
+pkgname='octopi-dev'
 pkgver=0.9.0
 pkgrel=2
 pkgdesc="A powerful Pacman frontend using Qt5 libs"
@@ -9,17 +9,18 @@ arch=('i686' 'x86_64')
 url="http://octopiproject.wordpress.com"
 license=('GPL2')
 depends=('qt5-base' 'qt5-declarative' 'pacman' 'alpm_octopi_utils>=1.0.1-1' 'qtermwidget')
-makedepends=('qt5-declarative' 'clang' 'qt5-tools')
+makedepends=('clang' 'qt5-tools')
 optdepends=('octopi-notifier-qt5: Notifier for Octopi using Qt5 libs'
             'octopi-notifier-frameworks: Notifier for Octopi with Knotifications support'
-            'gist: for SysInfo report'
             'pacaur: for AUR support'
-            'trizen: for AUR support'
             'pikaur: for AUR support'
+            'trizen: for AUR support'
             'yay: for AUR support'
+            'gist: for SysInfo report'
             'pacmanlogviewer: to view pacman log files')
 provides=('octopi' 'octopi-repoeditor' 'octopi-cachecleaner')
-conflicts=('octopi-git' 'octopi-kde-git' 'octopi-notifier-noknotify')
+conflicts=('octopi')
+#conflicts=('octopi-git' 'octopi-kde-git' 'octopi-notifier-noknotify')
 
 _pkggit=octopi
 _gitcommit=31060ae2b2f7c496c95b2262b8219c39b65e45be
@@ -27,6 +28,8 @@ _gitcommit=31060ae2b2f7c496c95b2262b8219c39b65e45be
 source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz")
 sha256sums=('2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c')
 
+_subdirs=(helper repoeditor cachecleaner sudo)
+
 prepare() {
   cd "${srcdir}/${_pkggit}-${_gitcommit}"
   
@@ -41,25 +44,13 @@ build() {
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro -spec linux-clang
   make
 
-  cd helper
-  echo "Building octopi-helper..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-helper.pro -spec linux-clang
-  make
-
-  cd ../repoeditor
-  echo "Building octopi-repoeditor..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-repoeditor.pro -spec linux-clang
-  make
-
-  cd ../cachecleaner
-  echo "Building octopi-cachecleaner..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-cachecleaner.pro -spec linux-clang
-  make
-
-  cd ../sudo
-  echo "Building octopi-sudo..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-sudo.pro -spec linux-clang
-  make
+  for _subdir in ${_subdirs[@]}; do
+    pushd $_subdir
+    echo "Building octopi-$_subdir..."
+    qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" "octopi-$_subdir.pro" -spec linux-clang
+    make
+    popd
+  done
 }
 
 package() {
@@ -67,15 +58,9 @@ package() {
   
   make INSTALL_ROOT="${pkgdir}" install
   
-  cd helper
-  make INSTALL_ROOT="${pkgdir}" install
-  
-  cd ../repoeditor
-  make INSTALL_ROOT="${pkgdir}" install
-  
-  cd ../cachecleaner
-  make INSTALL_ROOT="${pkgdir}" install
-  
-  cd ../sudo
-  make INSTALL_ROOT="${pkgdir}" install
+  for _subdir in ${_subdirs[@]}; do
+    pushd $_subdir
+    make INSTALL_ROOT="${pkgdir}" install
+    popd
+  done
 }