[packages/slim] - updated login_cmd to use xinitrc - remove now unnecessary banner

[baggins]

commit 98336113c79dd366d9a52868663cae72dcb7d716
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Mar 26 12:24:47 2013 +0100

    - updated login_cmd to use xinitrc
    - remove now unnecessary banner

 slim-configuration.patch | 22 ++++++++++++++++++----
 slim.spec                |  7 ++-----
 2 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/slim.spec b/slim.spec
index 83b7d30..e487fd0 100644
--- a/slim.spec
+++ b/slim.spec
@@ -16,6 +16,7 @@ Source2:	%{name}.sysconfig
 Source3:	%{name}.pamd
 Patch0:		%{name}-configuration.patch
 Patch1:		cmake.patch
+Patch2:		default-session.patch
 URL:		http://slim.berlios.de/
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	cmake
@@ -84,6 +85,7 @@ Możliwości:
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
@@ -123,11 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add slim
 # -n option not to actually restart as it will terminate all sessions opened from slim!
 %service -n slim restart "SLiM Display Manager"
-%banner -e %{name} <<EOF
-NOTE: You need to prepare ~/.xinitrc to make slim work.
-Take a look at %{_docdir}/%{name}-%{version}/xinitrc.sample*
-
-EOF
 %systemd_reload
 
 %preun
diff --git a/slim-configuration.patch b/slim-configuration.patch
index d5de33d..7bad9b8 100644
--- a/slim-configuration.patch
+++ b/slim-configuration.patch
@@ -9,15 +9,29 @@
  reboot_cmd          /sbin/shutdown -r now
  console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
  #suspend_cmd        /usr/sbin/suspend
-@@ -51,7 +51,7 @@
+@@ -33,7 +33,7 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           if [ -r ~/.xinitrc ]; then exec /bin/sh -login ~/.xinitrc %session; else exec /etc/X11/xinit/xinitrc %session; fi
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -51,10 +51,10 @@
  # The current chosen session name is replaced in the login_cmd
  # above, so your login command can handle different sessions.
  # see the xinitrc.sample file shipped with slim sources
 -sessions            xfce4,icewm-session,wmaker,blackbox
-+sessions            xfce4,gnome,kde,icewm-session,wmaker,blackbox
++sessions            xfce,gnome,kde,icewm,wmaker,blackbox
+ 
+-# Executed when pressing F11 (requires imagemagick)
+-screenshot_cmd      import -window root /slim.png
++# Executed when pressing F11
++screenshot_cmd      xwd -root > /slim.xwd
  
- # Executed when pressing F11 (requires imagemagick)
- screenshot_cmd      import -window root /slim.png
+ # welcome message. Available variables: %host, %domain
+ welcome_msg         Welcome to %host
 --- slim-1.3.0/xinitrc.sample	2007-07-15 16:09:28.000000000 +0200
 +++ slim-1.3.0.config/xinitrc.sample	2007-08-26 12:23:11.756406046 +0200
 @@ -6,6 +6,12 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/slim.git/commitdiff/276a93a393be1a335f8c7dd49a7b46b59a5e6e8a