Updated PKGBUILD and install text.

3 files changed, 28 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4c29f73b2a8..14c80a403fb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = glass-wm-git
-	pkgdesc = Glass is a small, extensible, window manager.
-	pkgver = r249.58dce10
+	pkgdesc = A small, extensible, window manager.
+	pkgver = 0.1.r4.g351cb77
 	pkgrel = 1
 	url = https://github.com/cdbfoster/glass
 	install = glass-wm.install
-	arch = x86_64
 	arch = i686
+	arch = x86_64
 	license = GPL3
-	makedepends = git
 	makedepends = cmake
-	depends = xcb-util-wm
+	makedepends = git
+	makedepends = pkg-config
 	depends = pango
-	depends = xcb-util-keysyms
 	depends = xcb-util
+	depends = xcb-util-cursor
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
 	provides = glass-wm
 	conflicts = glass-wm
 	source = glass-wm::git+https://github.com/cdbfoster/glass.git
diff --git a/PKGBUILD b/PKGBUILD
index 76a2164b262e..47aa231bca24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,30 @@
-# Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: 
+# Maintainer: Chris Foster <cdbfoster@gmail.com>
+# Contributor: Josip Ponjavic
 
 pkgname=glass-wm-git
-pkgver=r249.58dce10
+pkgver=0.1.r4.g351cb77
 pkgrel=1
-pkgdesc="Glass is a small, extensible, window manager."
-arch=('x86_64' 'i686')
+pkgdesc="A small, extensible, window manager."
+arch=('i686' 'x86_64')
 url="https://github.com/cdbfoster/glass"
 license=('GPL3')
-depends=('xcb-util-wm' 'pango' 'xcb-util-keysyms' 'xcb-util')
-makedepends=('git' 'cmake')
-conflicts=("${pkgname%-*}")
+depends=('pango'
+         'xcb-util'
+         'xcb-util-cursor'
+         'xcb-util-keysyms'
+         'xcb-util-wm')
+makedepends=('cmake'
+             'git'
+             'pkg-config')
 provides=("${pkgname%-*}")
+conflicts=("${pkgname%-*}")
 install="${pkgname%-*}.install"
 source=("${pkgname%-*}::git+$url.git" 'glass-wm.desktop')
 md5sums=('SKIP' 'a2c7c82c3a2348aabfc7321bbd4b08e8')
 
 pkgver() {
     cd "${pkgname%-*}"
-
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//'
 }
 
 prepare() {
@@ -27,14 +32,14 @@ prepare() {
 }
 
 build() {
-    cd "build"
+    cd build
 
-    cmake ../${pkgname%-*}
+    cmake -DCMAKE_BUILD_TYPE=Release "../${pkgname%-*}"
     make
 }
 
 package() {
-    install -Dm755 "$srcdir/build/glass" "$pkgdir/usr/bin/glass-wm"
+    install -Dm755 "$srcdir/build/glass-wm" "$pkgdir/usr/bin/glass-wm"
     install -Dm644 "$srcdir/${pkgname%-*}.desktop" \
         "$pkgdir/usr/share/xsessions/${pkgname%-*}.desktop"
 }
diff --git a/glass-wm.install b/glass-wm.install
index f3ffdf6b9095..130830e29761 100644
--- a/glass-wm.install
+++ b/glass-wm.install
@@ -1,4 +1,4 @@
 post_install() {
-	echo ">>> To start glass-wm, add following to ~/.xinitrc"
-	echo ">>> exec glass-wm"
+	echo ">>> To start glass-wm, add following to ~/.xinitrc:"
+	echo ">>>   exec glass-wm"
 }