[xmonad/el6] rebase to f16 branch which is more appropriate for gnome2 sessions

Mon May 28 10:04:38 UTC 2012

commit 63c954e7b6d4377f0e7a468c722f930e04f92363
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon May 28 19:04:07 2012 +0900

    rebase to f16 branch which is more appropriate for gnome2 sessions
    
    - drop basic subpackage
    - gnome2 gnome-session does not have --session= or fallback mode

 xmonad-gnome-session.desktop |    2 +-
 xmonad-start                 |   22 +++++++++++----
 xmonad.spec                  |   60 ++++++++++++++++++-----------------------
 3 files changed, 43 insertions(+), 41 deletions(-)
---

diff --git a/xmonad-gnome-session.desktop b/xmonad-gnome-session.desktop
index 34fa77c..f09b84b 100644
--- a/xmonad-gnome-session.desktop
+++ b/xmonad-gnome-session.desktop
@@ -2,5 +2,5 @@
 Name=xmonad-gnome
 Comment=Tiling window manager
 TryExec=/usr/bin/gnome-session
-Exec=gnome-session --session=xmonad
+Exec=xmonad-start gnome-session
 Type=XSession
diff --git a/xmonad-start b/xmonad-start
index 135fc47..9d70561 100644
--- a/xmonad-start
+++ b/xmonad-start
@@ -1,11 +1,13 @@
 #!/bin/sh
 
+XMONAD_DIR=$HOME/.xmonad
+
 #  if no user configuration
-if [ ! -d ~/.xmonad ]; then
+if [ ! -d $XMONAD_DIR ]; then
     # add a desktop friendly config if possible
     if [ -r /usr/share/xmonad/xmonad.hs ]; then
-	mkdir ~/.xmonad
-	cp -p /usr/share/xmonad/xmonad.hs ~/.xmonad
+	mkdir $XMONAD_DIR
+	cp -p /usr/share/xmonad/xmonad.hs $XMONAD_DIR
     else
 	echo "xmonad-start: install xmonad-config to customize"
     fi
@@ -17,8 +19,16 @@ if [ ! -d ~/.xmonad ]; then
     $TERM_CMD man xmonad &
 fi
 
-if [ -r ~/.xmonad/session ]; then
-    sh ~/.xmonad/session
+if [ -r $XMONAD_DIR/session ]; then
+    sh $XMONAD_DIR/session
 fi
 
-xmonad
+if [ -n "$*" ]; then
+    if [ -d $XMONAD_DIR -a "$(ls -t $XMONAD_DIR | head -1)" = "xmonad.hs" ]; then
+	xmonad --recompile
+    fi
+    xmonad &
+    $*
+else
+    xmonad
+fi
diff --git a/xmonad.spec b/xmonad.spec
index 6661393..6218235 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -18,7 +18,7 @@ on several screens.
 
 Name:           %{pkg_name}
 Version:        0.10
-Release:        6%{?dist}
+Release:        3.4.1%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -45,45 +45,29 @@ BuildRequires:  ghc-extensible-exceptions-prof
 BuildRequires:  ghc-process-prof
 BuildRequires:  ghc-unix-prof
 BuildRequires:  ghc-utf8-string-prof
-Requires:       %{pkg_name}-basic = %{version}-%{release}
 Requires:       %{pkg_name}-config = %{version}-%{release}
 
 %description
 %{common_description}
 
-This is a meta-package that installs xmonad-basic and ghc-xmonad-contrib-devel,
-allowing xmonad to be customized with "~/.xmonad/xmonad.hs".
+This is a meta-package that installs xmonad-core and ghc-xmonad-contrib-devel,
+allowing xmonad to be configured with "~/.xmonad/xmonad.hs".
 
 To use xmonad with GNOME, please install xmonad-gnome.
 
 
-%package basic
+%package core
 Summary:        A tiling window manager
-Requires:       %{pkg_name}-core = %{version}-%{release}
 # required until there is a command to open a system-default xterminal
 Requires:       xterm
 Requires:       dmenu
-Obsoletes:      %{pkg_name}-core < %{version}-%{release}
-
-%description basic
-%{common_description}
-
-This meta-package allows running the default basic upstream xmonad
-configuration with xterm and dmenu.
-
-If you want to customize xmonad, please install xmonad or xmonad-gnome.
-
-
-%package core
-Summary:        A tiling window manager
 # for xmessage
 Requires:       xorg-x11-apps
 
 %description core
-This package just provides the core xmonad window manager program.
+This package contains the core xmonad window manager.
 
-To run the default xmonad configuration you should install xmonad-basic.
-If you want to customize xmonad please install either xmonad or xmonad-gnome.
+If you want to configure xmonad please also install either xmonad or xmonad-gnome.
 
 
 %package config
@@ -93,7 +77,7 @@ Requires:       ghc-%{pkg_name}-devel = %{version}-%{release}
 Requires:       ghc-xmonad-contrib-devel
 
 %description config
-This package provides a basic desktop configuration for xmonad.
+This package adds desktop configuration for xmonad.
 
 
 %package gnome
@@ -130,6 +114,8 @@ install -p -m 0644 -D %SOURCE6 %{buildroot}%{_datadir}/gnome-session/sessions/%{
 install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/%{name}.hs
 
 rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
+# ship LICENSE in xmonad-core
+rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
 
 
 %ghc_package
@@ -148,13 +134,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 %files
 
 
-%files basic
-
-
 %files core
 %doc CONFIG LICENSE README man/%{name}.hs README.fedora
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-start
+%{_bindir}/%{name}-start
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/xsessions/%{name}.desktop
@@ -174,16 +157,25 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %changelog
-* Sun May 20 2012 Jens Petersen <petersen at redhat.com> - 0.10-6
-- add LICENSE to ghc_files
+* Fri May 25 2012 Jens Petersen <petersen at redhat.com> - 0.10-3.4.1
+- use f16 xmonad-start to start gnome-session
+- add license to ghc_files
 
-* Mon Feb 20 2012 Jens Petersen <petersen at redhat.com> - 0.10-5
+* Fri Feb 24 2012 Jens Petersen <petersen at redhat.com> - 0.10-3.4
+- also fix xmonad-gnome startup on bare metal gnome-session
+  using gnome-fallback session
+
+* Wed Feb 22 2012 Jens Petersen <petersen at redhat.com> - 0.10-3.3
+- replace xmonad-gnome-session with "xmonad-start gnome-session"
+- workaround startup compile leading to metacity running instead
 - 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
+* Sun Feb 19 2012 Jens Petersen <petersen at redhat.com> - 0.10-3.2
+- install xmonad-gnome-session script
+
+* Sun Feb 19 2012 Jens Petersen <petersen at redhat.com> - 0.10-3.1
+- workaround gnome-session 3.2 timeout with new xmonad-gnome-session
+- change the xmonad-gnome session name to xmonad-gnome
 
 * Tue Feb  7 2012 Jens Petersen <petersen at redhat.com> - 0.10-3
 - xmonad-gnome sessions now use gnomeConfig in xmonad.hs
