[bluetile] make gnome-bluetile-session a script; use bluetile for WMName

[Jens Petersen]

commit 88730c5f82828c22581d550ded480cc303ae59d1
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon May 23 13:30:33 2011 +0900

    make gnome-bluetile-session a script; use bluetile for WMName

 README.fedora               |    8 ++++++--
 bluetile-0.5.3-WMName.patch |   14 +++++++++++++-
 bluetile.spec               |   19 ++++++++++++-------
 gnome-bluetile-session      |    4 ++++
 4 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/README.fedora b/README.fedora
index 91f69bc..57a19a3 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,5 +1,9 @@
-Bluetile can be started from GDM by selecting
-"Bluetile" or "GNOME + Bluetile" from the session menu.
+= Starting from GDM =
+Bluetile can be started from GDM's session menu by selecting one of:
+
+- "Bluetile": a plain bluetile session
+- "GNOME + Bluetile": GNOME session with bluetile as window manager
+  (runs "gnome-session --session=bluetile")
 
 = Advanced configuration =
 If you want to do finer configuration and customization
diff --git a/bluetile-0.5.3-WMName.patch b/bluetile-0.5.3-WMName.patch
index 5c4162b..10c8717 100644
--- a/bluetile-0.5.3-WMName.patch
+++ b/bluetile-0.5.3-WMName.patch
@@ -6,7 +6,19 @@ diff -u bluetile-0.5.3/src/Config.hs\~ bluetile-0.5.3/src/Config.hs
      defaultConfig
          { modMask = defaultModifierBRC bluetilerc,
 -          startupHook = ewmhDesktopsStartup >> setWMName "LG3D",
-+          startupHook = ewmhDesktopsStartup >> setWMName "Bluetile",
++          startupHook = ewmhDesktopsStartup,
            manageHook = bluetileManageHook,
            layoutHook = bluetileLayoutHook bluetileTheme,
            logHook = currentWorkspaceOnTop >> ewmhDesktopsLogHook,
+diff -u bluetile-0.5.3/src/XMonad/Hooks/EwmhDesktops.hs\~ bluetile-0.5.3/src/XMonad/Hooks/EwmhDesktops.hs
+--- bluetile-0.5.3/src/XMonad/Hooks/EwmhDesktops.hs~	2010-08-11 06:58:22.000000000 +0900
++++ bluetile-0.5.3/src/XMonad/Hooks/EwmhDesktops.hs	2011-05-23 09:49:52.000000000 +0900
+@@ -243,7 +243,7 @@
+                          ]
+     io $ changeProperty32 dpy r a c propModeReplace (fmap fromIntegral supp)
+ 
+-    setWMName "xmonad"
++    setWMName "bluetile"
+ 
+ setActiveWindow :: X ()
+ setActiveWindow = withWindowSet $ \s -> withDisplay $ \dpy -> do
diff --git a/bluetile.spec b/bluetile.spec
index 312833f..a3dc650 100644
--- a/bluetile.spec
+++ b/bluetile.spec
@@ -4,7 +4,7 @@
 
 Name:           bluetile
 Version:        0.5.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tiling window manager for GNOME
 
 Group:          User Interface/X
@@ -12,9 +12,9 @@ License:        BSD
 URL:            http://www.bluetile.org/
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:        README.fedora
-Source2:        bluetile.session
-Patch1:         gnome-bluetile-session.patch
-Patch2:         bluetile-0.5.3-WMName.patch
+Source2:        gnome-bluetile-session
+Source3:        bluetile.session
+Patch1:         bluetile-0.5.3-WMName.patch
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
 BuildRequires:  ghc-devel
@@ -35,7 +35,6 @@ conventions and providing both mouse and keyboard access for all features.
 %prep
 %setup -q
 %patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
 
 cp -p %{SOURCE1} .
 
@@ -50,12 +49,13 @@ cp -p %{SOURCE1} .
 install -p -m 0644 -D misc/%{name}-session.desktop %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications misc/%{name}.desktop
 
-# patched to use "gnome-session --session=" instead of gnome-bluetile-session
 install -p -m 0644 -D misc/gnome-bluetile-session.desktop %{buildroot}%{_datadir}/xsessions/
+# replace gnome-bluetile-session with script
 rm %{buildroot}%{_bindir}/gnome-%{name}-session
+install -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/gnome-%{name}-session
 
 mkdir -p %{buildroot}%{_datadir}/gnome-session/sessions/
-install -p -m 0644 %SOURCE2 %{buildroot}%{_datadir}/gnome-session/sessions
+install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/gnome-session/sessions
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
@@ -65,6 +65,7 @@ install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
 %defattr(-,root,root,-)
 %doc LICENSE README.fedora
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/gnome-%{name}-session
 %{_libexecdir}/%{name}*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome-session/sessions/%{name}.session
@@ -74,6 +75,10 @@ install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Mon May 23 2011 Jens Petersen <petersen at redhat.com> - 0.5.3-10
+- use bluetile for WMName
+- replace gnome-bluetile-session with a script
+
 * Thu May 12 2011 Jens Petersen <petersen at redhat.com> - 0.5.3-9
 - patch the WMName to be Bluetile
 
diff --git a/gnome-bluetile-session b/gnome-bluetile-session
new file mode 100755
index 0000000..9e65499
--- /dev/null
+++ b/gnome-bluetile-session
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bluetile &
+gnome-session --session=bluetile