From 5df395d77f4c88fa98b6aa680fb601662d16ae3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 19 Apr 2013 11:05:26 -0300
Subject: spectrwm-libre-2.2.0-1: updating version

---
 libre/spectrwm-libre/PKGBUILD | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index a5a9b9b50..d873da4f7 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -4,9 +4,9 @@
 
 _pkgname=spectrwm
 pkgname=spectrwm-libre
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way (without unfree profont support)"
+pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.spectrwm.org"
 _watch="https://opensource.conformal.com/snapshots/spectrwm/"
@@ -14,14 +14,14 @@ license=('custom:ISC')
 depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
 replaces=('spectrwm' 'scrotwm')
 conflicts=('spectrwm')
-provides=("spectrwm=${pkgver}")
+provides=("spectrwm=$pkgver")
 makedepends=('libxt')
-optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
+optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font')
 backup=(etc/spectrwm.conf)
 source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('cd0ca423445bdc5a74528ca23166449b'
+md5sums=('c572727b5fb9fe3674c03a7e51d191c4'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e')
 
@@ -32,7 +32,12 @@ build() {
   sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
   sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c
   sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
+  # crashes if defaults can't be found, use smaller defaults
   sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
+  #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf
+
+  # see spectrwm FS#403
+  sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
 
   cd linux
   make PREFIX="/usr"
-- 
cgit v1.2.3-2-g168b