5 files changed, 84 insertions, 14 deletions
diff --git a/desktop/openbox/README b/desktop/openbox/README
index 345bf31ea4559..28588674533be 100644
--- a/desktop/openbox/README
+++ b/desktop/openbox/README
@@ -13,9 +13,17 @@ KXINIT=YES ./openbox.SlackBuild
 
 If you do not make the package with this support and you want to run 
 Openbox in KDE or GNOME, then you should copy the respective xinitrc 
-script from /usr/doc/openbox to /etc/X11/xinit/.  You will also need 
-to copy openbox-kde-session or openbox-gnome-session to /usr/bin/.  
-To be used, all the scripts will need to be executable.
+script from /usr/doc/openbox/xinit to /etc/X11/xinit/.  You will 
+also need to copy openbox-kde-session or openbox-gnome-session to 
+/usr/bin/.  To be used, all the scripts will need to be executable.
+
+NOTE: This SlackBuild nows has xinit scripts for openbox and 
+openbox-session.  You *must* select "openbox-session" in order to 
+use your autostart file.  It is recommended that you run xwmconfig 
+to correct this if you have used previous versions of this 
+SlackBuild.  Similarly, select "Openbox-Session" instead of 
+"Openbox" in KDM/XDM if you want session management and your 
+autostart file to be used.
 
 If you do not plan on using a session manager with Openbox you can 
 build a smaller binary by disabling session management support.  To 
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild
index cb76a523df4d3..e837aa537fe4b 100644
--- a/desktop/openbox/openbox.SlackBuild
+++ b/desktop/openbox/openbox.SlackBuild
@@ -3,13 +3,15 @@
 # Slackware build script for Openbox 
 
 # Written by Chess Griffin <chess@chessgriffin.com>
+
 # Modifications for KDE and GNOME xinitrc scripts 
-#  by Phillip Warner <pc_warner@yahoo.com>
+# and Slackware 12.1 KDM session fixes 
+# by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=openbox
-VERSION=3.4.6.1
+VERSION=${VERSION:-3.4.7.2}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -35,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -46,7 +50,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -55,7 +63,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-startup-notification
+  --enable-startup-notification \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -73,6 +83,9 @@ make install DESTDIR=$PKG
 # Add xinitrc.openbox so that openbox will show up as an option in xwmconfig
 install -D -m 0755 $CWD/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox
 
+# Add xinitrc.openbox-session so that openbox-session will show up as an option in xwmconfig
+install -D -m 0755 $CWD/xinitrc.openbox-session $PKG/etc/X11/xinit/xinitrc.openbox-session
+
 # Optionally install xinitrc scripts for running Openbox in KDE or GNOME
 # Move the scripts from /usr/bin if the xinitrc scripts are not installed.
 if [ "$KXINIT" == "YES" ]; then
@@ -88,12 +101,27 @@ else
 	rm -vf $PKG/usr/bin/openbox-gnome-session
 fi
 
+# Change name of openbox.desktop KDM session file so it corresponds to openbox-session
+( cd $PKG/usr/share/xsessions
+  mv openbox.desktop openbox-session.desktop
+  sed -i "s/Name=Openbox/Name=Openbox-Session/" openbox-session.desktop
+)
+
+# Create symlinks to KDM session desktop files so KDM will use them
+mkdir -p $PKG/usr/share/apps/kdm/sessions
+( cd $PKG/usr/share/apps/kdm/sessions
+  for i in $PKG/usr/share/xsessions/openbox*.desktop ; do
+  	ln -s /usr/share/xsessions/$(basename $i) $(basename $i) ;
+  done
+)
+
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-for i in $CWD/xinitrc.*openbox ; do
-	cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i) ;
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/xinit
+for i in $CWD/xinitrc.*openbox* ; do
+	cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/xinit/$(basename $i) ;
 done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
diff --git a/desktop/openbox/openbox.info b/desktop/openbox/openbox.info
index 0ba093ce19d19..81952518cf3ff 100644
--- a/desktop/openbox/openbox.info
+++ b/desktop/openbox/openbox.info
@@ -1,8 +1,8 @@
 PRGNAM="openbox"
-VERSION="3.4.6.1"
+VERSION="3.4.7.2"
 HOMEPAGE="http://icculus.org/openbox/"
-DOWNLOAD="http://icculus.org/openbox/releases/openbox-3.4.6.1.tar.gz"
-MD5SUM="0000c3a72d9fb956128cee7fd27ff19f"
+DOWNLOAD="http://icculus.org/openbox/releases/openbox-3.4.7.2.tar.gz"
+MD5SUM="9e7589e90519bc6ac2f4656ea6869439"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
 APPROVED="rworkman"
diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox
index 572ae8f8c085b..483649b6500d1 100644
--- a/desktop/openbox/xinitrc.openbox
+++ b/desktop/openbox/xinitrc.openbox
@@ -31,4 +31,4 @@ if [ ! -d $HOME/.config/openbox ]; then
   cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
 fi
 
-exec openbox-session
+exec openbox
diff --git a/desktop/openbox/xinitrc.openbox-session b/desktop/openbox/xinitrc.openbox-session
new file mode 100644
index 0000000000000..572ae8f8c085b
--- /dev/null
+++ b/desktop/openbox/xinitrc.openbox-session
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    /usr/bin/xmodmap $usermodmap
+fi
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+  mkdir -p $HOME/.config/openbox
+  cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+  cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+exec openbox-session