From 38a69d50b35bd00782a2c34ac09114acba160a1f728f90777bc8e18a743f13e9 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 27 Sep 2011 11:24:09 +0000
Subject: [PATCH] Accepting request 84861 from
 home:vuntz:branches:GNOME:Factory

Update to 3.2.0

OBS-URL: https://build.opensuse.org/request/show/84861
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=125
---
 gnome                        | 17 ++++++++++-------
 gnome-session-3.1.92.tar.bz2 |  3 ---
 gnome-session-3.2.0.tar.bz2  |  3 +++
 gnome-session.changes        | 13 +++++++++++++
 gnome-session.spec           |  4 ++--
 5 files changed, 28 insertions(+), 12 deletions(-)
 delete mode 100644 gnome-session-3.1.92.tar.bz2
 create mode 100644 gnome-session-3.2.0.tar.bz2

diff --git a/gnome b/gnome
index 39158e9..1376211 100644
--- a/gnome
+++ b/gnome
@@ -30,11 +30,11 @@ if test "$IS_LIVE_IMAGE" = "yes" ; then
   ## the desktop, since the desktop is not managed by nautilus anymore (by
   ## default)
 
-  if test -f /etc/xdg/menus/${XDG_MENU_PREFIX}applications.menu; then
+  if test -f /etc/xdg/menus/${XDG_MENU_PREFIX}applications.menu -a ! -f "${XDG_CONFIG_HOME}/menus/${XDG_MENU_PREFIX}applications.menu"; then
     # Add live installer to the system tools menu (this is nice to have, and also
     # required for the favorite app change below)
     mkdir -p -m 0700 "${XDG_CONFIG_HOME}"
-    mkdir "${XDG_CONFIG_HOME}/menus"
+    mkdir -p "${XDG_CONFIG_HOME}/menus"
     cat > "${XDG_CONFIG_HOME}/menus/${XDG_MENU_PREFIX}applications.menu" << EOF
 <Menu>  
   <Name>Applications</Name>
@@ -47,17 +47,20 @@ if test "$IS_LIVE_IMAGE" = "yes" ; then
   </Menu>
 </Menu>
 EOF
+  fi
 
-    # Add live installer as favorite application to gnome-shell dash
-    FAVORITES=`gsettings get org.gnome.shell favorite-apps`
-    if test $? -eq 0; then
+  # Add live installer as favorite application to gnome-shell dash
+  FAVORITES=`gsettings get org.gnome.shell favorite-apps`
+  if test $? -eq 0; then
+    echo ${FAVORITES} | grep -q YaST2-live-installer.desktop
+    if test $? -ne 0; then
       FAVORITES=`echo ${FAVORITES} | sed "s:^\[:\['YaST2-live-installer.desktop', :"`
       gsettings set org.gnome.shell favorite-apps "${FAVORITES}"
     fi
-
-    # FIXME: we need to add a launcher for gnome-panel (fallback mode)
   fi
 
+  # FIXME: we need to add a launcher for gnome-panel (fallback mode)
+
   ## Other tweaks
 
   # setup session to not have a lock-enabled screensaver
diff --git a/gnome-session-3.1.92.tar.bz2 b/gnome-session-3.1.92.tar.bz2
deleted file mode 100644
index 8b53b80..0000000
--- a/gnome-session-3.1.92.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:483f62bbb26dca1eb573509fafc30782e9d4e5023eacf4eabedef31f47831ef9
-size 821304
diff --git a/gnome-session-3.2.0.tar.bz2 b/gnome-session-3.2.0.tar.bz2
new file mode 100644
index 0000000..5814fa9
--- /dev/null
+++ b/gnome-session-3.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e42fd02cf0bc759c2dfee71cb70b0b6acefe84b8904e8e1d1fe36f475abae405
+size 822932
diff --git a/gnome-session.changes b/gnome-session.changes
index 5cd9cb9..00ac1fd 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Sep 26 10:44:11 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.2.0:
+  + Updated translations.
+- Update /usr/bin/gnome script to improve logging in twice on a
+  live image:
+  + Use -p with mkdir, to avoid failing when creating a directory
+    that already exists.
+  + Do not overwrite pre-existing user applications.menu.
+  + Do not add a second YaST2-live-installer.desktop favorite for
+    gnome-shell.
+
 -------------------------------------------------------------------
 Tue Sep 20 07:39:31 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gnome-session.spec b/gnome-session.spec
index 99890b9..6177e84 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -18,13 +18,13 @@
 
 
 Name:           gnome-session
-Version:        3.1.92
+Version:        3.2.0
 Release:        1
 License:        GPLv2+
 Summary:        Session Tools for the GNOME Desktop
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
-Source:         http://download.gnome.org/sources/gnome-session/3.1/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-session/3.2/%{name}-%{version}.tar.bz2
 Source1:        gnome
 Source2:        gnome.desktop
 # Temporarly needed until we get upstream to ship the right icon for suspend