4 files changed, 36 insertions, 11 deletions
diff --git a/desktop/spectrwm/slack-desc b/desktop/spectrwm/slack-desc
index 2cec4bc979..16a95bdf76 100644
--- a/desktop/spectrwm/slack-desc
+++ b/desktop/spectrwm/slack-desc
@@ -15,5 +15,5 @@ spectrwm: not require one to learn a language to do any configuration. It
 spectrwm: was written by hackers for hackers and it strives to be small,
 spectrwm: compact and fast.
 spectrwm:
-spectrwm: Homepage: https://opensource.conformal.com/wiki/spectrwm
+spectrwm: Homepage: https://github.com/conformal/spectrwm
 spectrwm:
diff --git a/desktop/spectrwm/spectrwm.SlackBuild b/desktop/spectrwm/spectrwm.SlackBuild
index 5ad7b39c43..ca3cc4494c 100644
--- a/desktop/spectrwm/spectrwm.SlackBuild
+++ b/desktop/spectrwm/spectrwm.SlackBuild
@@ -40,6 +40,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+UPNAM=$PRGNAM-SPECTRWM_2_7_2 # changed to allow cd to proper folder
 
 if [ "$ARCH" = "i486" ];then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -61,8 +62,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$UPNAM.tar.gz
+cd $UPNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -90,14 +91,19 @@ rm -f $PKG/usr/bin/scrotwm
 # Compress the manpages
 ( cd $PKG/usr/man; find . -type f -exec gzip -9 {} \; )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples/keybindings
+mkdir -p $PKG/usr/doc/$UPNAM/examples/keybindings
 install -m0644 -oroot -groot initscreen.sh $CWD/examples/* \
-    $PKG/usr/doc/$PRGNAM-$VERSION/examples/
-cp -a spectrwm.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/spectrwm_orig.conf
-cp -a spectrwm_*.conf $PKG/usr/doc/$PRGNAM-$VERSION/examples/keybindings/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+    $PKG/usr/doc/$UPNAM/examples/
+cp -a spectrwm.conf $PKG/usr/doc/$UPNAM/examples/spectrwm_orig.conf
+cp -a spectrwm_*.conf $PKG/usr/doc/$UPNAM/examples/keybindings/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$UPNAM/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
+# install xinitrc script
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.$PRGNAM > $PKG/etc/X11/xinit/xinitrc.$PRGNAM
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.$PRGNAM
+
 # desktop integration
 mkdir -m755 -p "${PKG}/usr/share/applications/"
 cp -a linux/spectrwm.desktop "${PKG}/usr/share/applications/"
diff --git a/desktop/spectrwm/spectrwm.info b/desktop/spectrwm/spectrwm.info
index 87dae20ea1..d1cb462fc1 100644
--- a/desktop/spectrwm/spectrwm.info
+++ b/desktop/spectrwm/spectrwm.info
@@ -1,8 +1,8 @@
 PRGNAM="spectrwm"
 VERSION="2.7.2"
-HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
-DOWNLOAD="https://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.7.2.tgz"
-MD5SUM="4eb5cf576d8e70555bd199e4bb96b479"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+DOWNLOAD="https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"
+MD5SUM="64755f7003faf099cebdc3e6b907c4d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/desktop/spectrwm/xinitrc.spectrwm b/desktop/spectrwm/xinitrc.spectrwm
new file mode 100644
index 0000000000..ee8f916496
--- /dev/null
+++ b/desktop/spectrwm/xinitrc.spectrwm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# Merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Start herbstluftwm
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+    exec ck-launch-session dbus-launch --exit-with-session /usr/bin/spectrwm
+else
+    exec spectrwm
+fi