[xmonad] xmonad-gnome: use gnome-terminal to display manpage; make the session name xmonad-gnome

[Jens Petersen]

commit 1c6494fa0d458a392991981981f483ab7cb0b3ae
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Feb 22 18:45:13 2012 +0900

    xmonad-gnome: use gnome-terminal to display manpage; make the session name xmonad-gnome

 xmonad-gnome-session.desktop |    2 +-
 xmonad-start                 |    9 ++++++---
 xmonad.spec                  |    6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/xmonad-gnome-session.desktop b/xmonad-gnome-session.desktop
index 42045b1..34fa77c 100644
--- a/xmonad-gnome-session.desktop
+++ b/xmonad-gnome-session.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=xmonad GNOME
+Name=xmonad-gnome
 Comment=Tiling window manager
 TryExec=/usr/bin/gnome-session
 Exec=gnome-session --session=xmonad
diff --git a/xmonad-start b/xmonad-start
index cf23ad5..135fc47 100644
--- a/xmonad-start
+++ b/xmonad-start
@@ -2,9 +2,6 @@
 
 #  if no user configuration
 if [ ! -d ~/.xmonad ]; then
-    # display the manpage
-    xterm -e man xmonad &
-
     # add a desktop friendly config if possible
     if [ -r /usr/share/xmonad/xmonad.hs ]; then
 	mkdir ~/.xmonad
@@ -12,6 +9,12 @@ if [ ! -d ~/.xmonad ]; then
     else
 	echo "xmonad-start: install xmonad-config to customize"
     fi
+    # display the manpage
+    case $DESKTOP_SESSION in
+	xmonad-gnome) TERM_CMD="gnome-terminal -x" ;;
+	*) TERM_CMD="xterm -e" ;;
+    esac
+    $TERM_CMD man xmonad &
 fi
 
 if [ -r ~/.xmonad/session ]; then
diff --git a/xmonad.spec b/xmonad.spec
index c99f329..6c3cc07 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -18,7 +18,7 @@ on several screens.
 
 Name:           %{pkg_name}
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -174,6 +174,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %changelog
+* Mon Feb 20 2012 Jens Petersen <petersen at redhat.com> - 0.10-5
+- use gnome-terminal to display initial manpage from xmonad-gnome
+- change the xmonad-gnome session name to xmonad-gnome
+
 * Tue Feb  7 2012 Jens Petersen <petersen at redhat.com> - 0.10-4
 - new "basic" meta-subpackage for pulling in xterm and dmenu for the default
   basic upstream config, also used by the base package