Follow package guidelines closer

2 files changed, 26 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb8b1a23880d..3912c343b096 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = quassel-client-lighter-git
 	optdepends = libdbusmenu-qt5: dbus context menu for icon tray support
 	provides = quassel-client
 	conflicts = quassel-client
-	source = quassel-client-lighter-git::git+https://github.com/quassel/quassel.git
+	source = quassel-client-lighter-git::git+https://github.com/quassel/quassel
 	md5sums = SKIP
 
 pkgname = quassel-client-lighter-git
diff --git a/PKGBUILD b/PKGBUILD
index 7780d55fb607..c92d66f47576 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,43 +13,41 @@ optdepends=('sonnet: spell checking support'
             'libdbusmenu-qt5: dbus context menu for icon tray support')
 provides=('quassel-client')
 conflicts=('quassel-client')
-source=("$pkgname"::"git+https://github.com/quassel/quassel.git")
+source=("$pkgname"::"git+https://github.com/quassel/quassel")
 md5sums=('SKIP')
 
 _builddir="build"
-_cmakecache="CMakeCache.txt"
 
 pkgver() {
-  cd "$pkgname"
+  cd "$srcdir/$pkgname"
   git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-_prepare_build() {
-    cd $srcdir/$pkgname
-    mkdir -p "$_builddir"
-    cd "$_builddir"
-}
-
-_build() {
-    ninja
+build() {
+  cd "$pkgname"
 
-    DESTDIR="$pkgdir" ninja install
+  rm -rf "$_builddir"
+  mkdir -p "$_builddir" && cd "$_builddir"
+
+  cmake -G Ninja                    \
+    -DWANT_MONO=OFF             \
+    -DWANT_CORE=OFF             \
+    -DWANT_QTCLIENT=ON          \
+    -DHAVE_SSL=ON               \
+    -DWITH_KDE=OFF              \
+    -DUSE_QT5=ON                \
+    -DWITH_WEBKIT=OFF           \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib  \
+    "$srcdir/$pkgname"
+
+  ninja
 }
 
 package() {
-    _prepare_build
-
-    cmake -G Ninja                    \
-        -DWANT_MONO=OFF             \
-        -DWANT_CORE=OFF             \
-        -DWANT_QTCLIENT=ON          \
-        -DHAVE_SSL=ON               \
-        -DWITH_KDE=OFF              \
-        -DUSE_QT5=ON                \
-        -DWITH_WEBKIT=OFF           \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib  \
-        "$srcdir/$pkgname"
-
-    _build
+  cd "$pkgname/$_builddir"
+
+  DESTDIR="$pkgdir" ninja install
 }
+
+# vim:set ts=2 sw=2 et: