Cleaned and restructured PKGBUILD.

 - the packages are now built the same way as in the official RPM
   package
 - fixed incorrect arch options
 - updated info
 - removed some hacks

2 files changed, 51 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5de2580c5a89..3495285da984 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr 23 14:04:41 UTC 2016
+# Sat Apr 23 17:42:42 UTC 2016
 pkgbase = adwaita-qt
-	pkgdesc = The stylesheet to bend Qt applications to look like they belong into GNOME Shell
+	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell.
 	pkgver = 0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/MartinBriza/adwaita-qt
 	arch = any
 	arch = i686
@@ -18,14 +18,19 @@ pkgbase = adwaita-qt
 	sha256sums = 48ccf17088afb77e98fe409f4dc6fdccd035bbdbcb51f0c2f0da00ef204daba0
 
 pkgname = adwaita-qt5
+	arch = i686
+	arch = x86_64
 	depends = adwaita-qt-common
 	depends = qt5-base
 	optdepends = adwaita-qt4: Qt4 version
 
 pkgname = adwaita-qt4
+	arch = i686
+	arch = x86_64
 	depends = adwaita-qt-common
 	depends = qt4
 
 pkgname = adwaita-qt-common
 	arch = any
+	license = GPL
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f2faee6d606..e07083c6dcf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,71 @@
 # Maintainer: Juraj Fiala <doctorjellyface at riseup dot net>
 
 pkgbase=adwaita-qt
-pkgname=("${pkgbase}5" "${pkgbase}4" "$pkgbase-common")
+pkgname=(
+  "${pkgbase}5"
+  "${pkgbase}4"
+  "$pkgbase-common"
+)
 pkgver=0.4
-pkgrel=1
-pkgdesc='The stylesheet to bend Qt applications to look like they belong into GNOME Shell'
+pkgrel=2
+pkgdesc='A style to bend Qt applications to look like they belong into GNOME Shell.'
 arch=('any' 'i686' 'x86_64')
 url="https://github.com/MartinBriza/$pkgbase"
 license=('GPL' 'LGPL')
 groups=('adwaita-qt')
-makedepends=('cmake' 'qt4' 'qt5-base')
+makedepends=(
+  'cmake'
+  'qt4'
+  'qt5-base'
+)
 source=("https://github.com/MartinBriza/$pkgbase/archive/$pkgver.tar.gz")
 sha256sums=('48ccf17088afb77e98fe409f4dc6fdccd035bbdbcb51f0c2f0da00ef204daba0')
 
 prepare() {
-  mkdir -p build{-qt5,-qt4,-common}
+  mkdir -p $pkgbase-$pkgver/build{-qt,-qt4}
 }
 
 build() {
-  cd build-qt5
-  cmake ../$pkgbase-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  cd $pkgbase-$pkgver
 
-  cd ../build-qt4
-  cmake ../$pkgbase-$pkgver \
+  pushd build-qt4
+  cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DUSE_QT4=ON
-  make
+  popd
+
+  pushd build-qt
+  cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DQT_ROOT=/usr/lib/qt
+  popd
+
+  make -C build-qt4
+  make -C build-qt
 }
 
-package_adwaita-qt5() {
-  depends=('adwaita-qt-common' 'qt5-base')
-  optdepends=('adwaita-qt4: Qt4 version')
+package_adwaita-qt4() {
+  arch=('i686' 'x86_64')
+  depends=('adwaita-qt-common' 'qt4')
+
+  cd $pkgbase-$pkgver
+  make install/fast DESTDIR=$pkgdir -C build-qt4
+  install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
 
-  cd build-qt5
-  make install/fast DESTDIR=$pkgdir
-  mv $pkgdir/usr/lib/qt5 $pkgdir/usr/lib/qt
   # The assets are in common
   rm -rf $pkgdir/usr/share
 }
 
-package_adwaita-qt4() {
-  depends=('adwaita-qt-common' 'qt4')
+package_adwaita-qt5() {
+  arch=('i686' 'x86_64')
+  depends=('adwaita-qt-common' 'qt5-base')
+  optdepends=('adwaita-qt4: Qt4 version')
 
-  cd build-qt4
-  make install/fast DESTDIR=$pkgdir
+  cd $pkgbase-$pkgver
+  make install/fast DESTDIR=$pkgdir -C build-qt
+  install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
 
   # The assets are in common
   rm -rf $pkgdir/usr/share
@@ -55,6 +73,7 @@ package_adwaita-qt4() {
 
 package_adwaita-qt-common() {
   arch=('any')
+  license=('GPL')
 
-  install -Dm644 -t "$pkgdir/usr/share/themes/Adwaita/qt/assets/" "$srcdir/$pkgbase-$pkgver/assets/"*.png
+  install -Dm644 -t "$pkgdir/usr/share/themes/Adwaita/qt/assets/" "$pkgbase-$pkgver/assets/"*.png
 }