6 files changed, 14 insertions, 16 deletions
diff --git a/desktop/spectrwm/examples/spectrwm.conf b/desktop/spectrwm/examples/spectrwm.conf
index a88cd19992aa5..385f383d663f6 100644
--- a/desktop/spectrwm/examples/spectrwm.conf
+++ b/desktop/spectrwm/examples/spectrwm.conf
@@ -28,6 +28,13 @@ disable_border		= 1	# remove window border when bar is disabled and
 #modkey = Mod4 # Win
 modkey = Mod1 # Alt
 
+# Give some nice names for the workspaces
+#name = ws[1]:Console
+#name = ws[2]:Browser
+#name = ws[3]:File manager
+#name = ws[4]:Media player
+#name = ws[5]:Office suite
+
 # These will be started when spectrwm(1) starts.
 #autorun = ws[1]:urxvt
 #autorun = ws[1]:firefox
diff --git a/desktop/spectrwm/examples/spectrwm_screenshot.sh b/desktop/spectrwm/examples/spectrwm_screenshot.sh
index c169a1dec62ae..58a9b09c312e9 100644
--- a/desktop/spectrwm/examples/spectrwm_screenshot.sh
+++ b/desktop/spectrwm/examples/spectrwm_screenshot.sh
@@ -18,6 +18,6 @@ case "$1" in
 		"${CAPTURE_TOOL}" png:"${CAPTURE_PATH}"
 	;;
 	*)
-		echo "$0: $0 <-full | -window>" >&2
+		echo "$0: $0 <full | window>" >&2
 	;;
 esac
diff --git a/desktop/spectrwm/patches/01-linux_Makefile_swmhack_libdir.diff b/desktop/spectrwm/patches/01-linux_Makefile_swmhack_libdir.diff
deleted file mode 100644
index e5dd7f51b10a4..0000000000000
--- a/desktop/spectrwm/patches/01-linux_Makefile_swmhack_libdir.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- linux/Makefile.orig	2013-11-27 10:39:26.448879134 +0100
-+++ linux/Makefile	2013-11-27 10:42:28.977873694 +0100
-@@ -1,5 +1,5 @@
- CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
--CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
-+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
- LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
- 
- PREFIX?= /usr/local
diff --git a/desktop/spectrwm/patches/01-spectrwm_1_manual.diff.gz b/desktop/spectrwm/patches/01-spectrwm_1_manual.diff.gz
new file mode 100644
index 0000000000000..baa093b9cc27f
--- /dev/null
+++ b/desktop/spectrwm/patches/01-spectrwm_1_manual.diff.gz
diff --git a/desktop/spectrwm/spectrwm.SlackBuild b/desktop/spectrwm/spectrwm.SlackBuild
index 638221a334ab3..7204f00960fbb 100644
--- a/desktop/spectrwm/spectrwm.SlackBuild
+++ b/desktop/spectrwm/spectrwm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2011-2013 LEVAI Daniel
+# Copyright (c) 2011-2014 LEVAI Daniel
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spectrwm
-VERSION=${VERSION:-2.4.0}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,7 +70,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 < $CWD/patches/01-linux_Makefile_swmhack_libdir.diff
+gzip -dc $CWD/patches/01-spectrwm_1_manual.diff.gz |patch -p1
 cd linux
   CFLAGS="$SLKCFLAGS" make \
     PREFIX=/usr \
diff --git a/desktop/spectrwm/spectrwm.info b/desktop/spectrwm/spectrwm.info
index 8557517948379..8d0de9c73bc77 100644
--- a/desktop/spectrwm/spectrwm.info
+++ b/desktop/spectrwm/spectrwm.info
@@ -1,8 +1,8 @@
 PRGNAM="spectrwm"
-VERSION="2.4.0"
+VERSION="2.5.0"
 HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
-DOWNLOAD="https://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.4.0.tgz"
-MD5SUM="23e32c1e292f2fc94ed88195ffe60023"
+DOWNLOAD="https://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.5.0.tgz"
+MD5SUM="22355256693393779b2d366d312c4577"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""