From b258ffc98c7e985bdf97110ab21d90d2173931680f3f072dfb79e1c9a6e43b29 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 7 Oct 2009 11:27:48 +0000
Subject: [PATCH] Accepting request 21965 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-shell via accept of submit request 21965 revision 13.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/21965
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=15
---
 gnome-shell-session | 12 ++++++++++++
 gnome-shell.changes | 11 +++++++++++
 gnome-shell.spec    | 15 ++++++++++++++-
 gnome3.desktop      |  7 +++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 gnome-shell-session
 create mode 100644 gnome3.desktop

diff --git a/gnome-shell-session b/gnome-shell-session
new file mode 100644
index 0000000..f1244ef
--- /dev/null
+++ b/gnome-shell-session
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Script to start a GNOME session in a GNOME 3 preview mode.
+#
+
+if test -n "$XDG_CONFIG_DIRS"; then
+	export XDG_CONFIG_DIRS=/usr/share/gnome-shell/xdg-override:$XDG_CONFIG_DIRS
+else
+	export XDG_CONFIG_DIRS=/usr/share/gnome-shell/xdg-override:/etc/xdg
+fi
+
+exec /usr/bin/gnome $*
diff --git a/gnome-shell.changes b/gnome-shell.changes
index 7153805..9ed5877 100644
--- a/gnome-shell.changes
+++ b/gnome-shell.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct  7 13:14:17 CEST 2009 - vuntz@opensuse.org
+
+- Create a preview mode for GNOME 3 that can be started from gdm:
+  + install a .desktop file in /usr/share/xsessions.
+  + this .desktop file starts a script that will prepend a custom
+    directory to XDG_CONFIG_DIRS and then start the usual GNOME
+    script.
+  + the custom directory contain an autostart file for gnome-shell,
+    that overrides the default gnome-panel+windowmanager combo.
+
 -------------------------------------------------------------------
 Wed Sep 16 19:03:01 CEST 2009 - lmedinas@opensuse.org
 
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 92f4685..4ed134f 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -40,9 +40,14 @@ Version:        2.27.3
 Release:        1
 Summary:        GNOME Shell
 Source:         %{name}-%{version}.tar.bz2
+# To integrate a preview mode in GDM.
+# Note: this also explains the Requires on gnome-session below.
+Source1:        gnome-shell-session
+Source2:        gnome3.desktop
 # PATCH-FIX-OPENSUSE gnome-shell-libmozjs.patch vuntz@novell.com -- LD_LIBRARY_PATH neeeds to be set on 11.1
 Patch99:        gnome-shell-libmozjs.patch
 Requires:       %{name}-lang = %{version}
+Requires:       gnome-session
 # mutter-devel doesn't automatically bring mutter
 Requires:       mutter
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -76,6 +81,13 @@ find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
 %find_lang %{name}
 %suse_update_desktop_file %{name}
 %find_gconf_schemas
+# Preview mode for GNOME 3
+install -m755  %{S:1} %{buildroot}%{_libexecdir}/%{name}/
+install -d -m755 %{buildroot}%{_datadir}/xsessions
+install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/
+%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome3.desktop
+install -d -m755 %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart
+cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,7 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_libdir}/mutter/plugins/*.so
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome-shell
+%{_datadir}/gnome-shell/
+%{_datadir}/xsessions/*.desktop
 
 %files lang -f %{name}.lang
 
diff --git a/gnome3.desktop b/gnome3.desktop
new file mode 100644
index 0000000..38fb68b
--- /dev/null
+++ b/gnome3.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/usr/lib/gnome-shell/gnome-shell-session
+TryExec=/usr/lib/gnome-shell/gnome-shell-session
+Name=GNOME 3 Preview
+Comment=The GNU Network Object Model Environment. A complete, free and easy-to-use desktop environment