diff --git a/gnome-session-2.16.1.tar.bz2 b/gnome-session-2.16.1.tar.bz2
deleted file mode 100644
index de16501..0000000
--- a/gnome-session-2.16.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d6d21c6b9a4a2fe7bc288e8fdf36159444370973b4aa71dfc4c48bc0ad7cdf3
-size 677501
diff --git a/gnome-session-2.17.91.tar.bz2 b/gnome-session-2.17.91.tar.bz2
new file mode 100644
index 0000000..c4f9d95
--- /dev/null
+++ b/gnome-session-2.17.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e178b03ba575f7f8a804a3b96f48adce55497438fb20d855404d719cd4904c3f
+size 683757
diff --git a/gnome-session-compiz.patch b/gnome-session-compiz.patch
index f6158eb..919fc48 100644
--- a/gnome-session-compiz.patch
+++ b/gnome-session-compiz.patch
@@ -1,20 +1,22 @@
---- gnome-session/gnome-wm 2006/10/11 16:30:36 1.1
-+++ gnome-session/gnome-wm 2006/10/11 16:35:55
-@@ -43,6 +43,17 @@
- IFS=":"
- if [ -z "$WINDOW_MANAGER" ] ; then
+Index: gnome-session/gnome-wm
+===================================================================
+--- gnome-session/gnome-wm.orig
++++ gnome-session/gnome-wm
+@@ -55,6 +55,17 @@ if [ -z "$WINDOW_MANAGER" ] ; then
+
+ OLDIFS=$IFS
if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
-+
-+ if /usr/bin/xdpyinfo | /usr/bin/grep -q '^vendor release number: *70000001'; then
-+ if [ -x /usr/bin/compiz ]; then
-+ if [ -z "$SMID" ]; then
-+ exec /usr/bin/compiz --replace --sm-disable gconf
-+ else
-+ exec /usr/bin/compiz --replace --sm-client-id $SMID gconf
-+ fi
-+ fi
-+ fi
-+
- for wm in metacity sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm ; do
++
++ if /usr/bin/xdpyinfo | /usr/bin/grep -q '^vendor release number: *70000001'; then
++ if [ -x /usr/bin/compiz ]; then
++ if [ -z "$SMID" ]; then
++ exec /usr/bin/compiz --replace --sm-disable gconf
++ else
++ exec /usr/bin/compiz --replace --sm-client-id $SMID gconf
++ fi
++ fi
++ fi
++
+ for wm in $KNOWN_WM ; do
+ IFS=":"
for dir in $PATH ; do
- if [ -x "$dir/$wm" ] ; then
diff --git a/gnome-session-dist-splash.patch b/gnome-session-dist-splash.patch
index 006e4af..adfedf5 100644
--- a/gnome-session-dist-splash.patch
+++ b/gnome-session-dist-splash.patch
@@ -1,5 +1,5 @@
---- gnome-session/gnome-session.schemas.in
-+++ gnome-session/gnome-session.schemas.in
+--- data/gnome-session.schemas.in
++++ data/gnome-session.schemas.in
@@ -50,7 +50,7 @@
/apps/gnome-session/options/splash_image
gnome
diff --git a/gnome-session-wm-switch.patch b/gnome-session-wm-switch.patch
index f39cdf0..5ea10ed 100644
--- a/gnome-session-wm-switch.patch
+++ b/gnome-session-wm-switch.patch
@@ -1,4 +1,6 @@
---- gnome-session/main.c
+Index: gnome-session/main.c
+===================================================================
+--- gnome-session/main.c.orig
+++ gnome-session/main.c
@@ -37,12 +37,16 @@
@@ -14,11 +16,11 @@
#include "util.h"
+#include "prop.h"
+#include "session.h"
+ #include "gsm-dbus.h"
#include "gsm-sound.h"
#include "gsm-gsd.h"
- #include "gsm-keyring.h"
-@@ -322,6 +326,84 @@
- return (tm->tm_year >= 105); /* We start on Jan 1 2006 */
+@@ -192,6 +196,84 @@ gsm_shutdown_gconfd (void)
+ g_free (command);
}
+static void
@@ -102,7 +104,7 @@
int
main (int argc, char *argv[])
{
-@@ -489,6 +571,8 @@
+@@ -363,6 +445,8 @@ main (int argc, char *argv[])
putenv (session_name_env);
the_session = read_session (session_name);
diff --git a/gnome-session.changes b/gnome-session.changes
index 9b34969..4c5eb5b 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,4 +1,77 @@
-------------------------------------------------------------------
+Thu Mar 8 18:30:05 CST 2007 - maw@suse.de
+
+- Update to version 2.17.91.
+ Session Properties Dialog
+ * Update categories in the .desktop file for the new control center
+ (Vincent)
+ * Use new icon (Vincent)
+ * Fix priority order of autostart desktop files with the same name
+ (Vincent)
+ * Report connection errors more gracefully (Tom Tromey)
+ * Use GOption (Vincent)
+ * Reuse existing desktop files instead of overwriting them (Vincent)
+ * Rework code of edition of startup programs so that it actually works
+ well and comply with the freedesktop spec (Vincent)
+ * Use a toggle button to enable/disable startup programs (Vincent)
+ * Add a "Save current session" button (Josselin Mouette)
+ * Remove "ask to save" toggle button (Josselin Mouette)
+ * Remove edition of session names (Vincent)
+ * Remove splash screen toggle button (Vincent)
+ * Change order of the tabs (Vincent)
+ * Fix desktop file to use a correct icon (Vincent)
+ * Improve default size of the dialog (Vincent)
+ * Show names instead of commands for the startup programs (Vincent)
+ * HIGify quit dialog (Michael Terry, Vincent)
+
+ Session Manager
+ * Warn the user about more fatal errors (Tom Tromey)
+ * Use gtk-window-decorator for compiz (Vincent)
+ * Fix crash when two at-spi-registryd are running (Li Yuan)
+ * Don't hardcode start of assistive technologies software (Ariel Rios,
+ Vincent)
+ * Start the dbus daemon if it's not running (Julio M. Merino Vidal)
+ * Kill esd on exit (Loïc Minier)
+ * Fix priority order of autostart desktop files with the same name
+ (Vincent)
+ * Fix invalid use of memory (Tom Tromey)
+ * Fix quoting of commands when migration to new autostart system
+ (Tom Tromey)
+ * Increase timeout for starting at-spi-registryd. This should prevent
+ showing a window warning that accessibility won't work on slow
+ machines. (Frédéric Crozat)
+ * Hardcode start of assistive technologies software again since the
+ control center won't be ready for this in 2.18 (Vincent)
+ * Kill the clients in reverse order of priority, which makes logging
+ out a better experience (metacity is killed last) (Tom Tromey)
+ * Remove useless code (Claudio Saavedra)
+ * Fix bug where clicking logout button doesn't work if
+ mouse pointer happens to be on top of the button when
+ the window is mapped (bug 52047) (Ray Strode)
+ * Make treview searching search the right column
+ (Brent Smith)
+ * Get rid of init as the parent of all processes
+ (Tom Tromey)
+ * Add fading effect for the splash screen icons
+ (Daniel Godás)
+ * Add command line option to avoid confirmation dialog
+ on kill (William McCann)
+ * Add fvwm support (Ken Deeter)
+ * Add support for compiz (Vincent)
+ * Do less work if $WINDOW_MANAGER is set (Vincent)
+ * Set http_proxy variable correctly (Ray Strode)
+ * Don't set http_proxy variable at all if the proxy
+ requires authentication (Ray Strode)
+ * Don't pop up useless dialog when saving session (Tom Tromey)
+ * Accept Enter key to close dialog when editing a session/startup
+ program (Tom Tromey)
+ * Set http_proxy environment variable based on GNOME settings
+ for legacy apps (Ray Strode)
+ * Launch at-spi-registryd for accessibility (Ariel Ros)
+ * Improve gnome-session-remove command line handling (Tom Tromey)
+ * Use Program instead of Command in the capplet (Tom Tromey)
+
+-------------------------------------------------------------
Fri Mar 2 14:58:46 CET 2007 - sbrabec@suse.cz
- Do not own /usr/share/xsessions (#229172).
diff --git a/gnome-session.spec b/gnome-session.spec
index 60eaf74..697cea3 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-session (Version 2.16.1)
+# spec file for package gnome-session (Version 2.17.91)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: gnome-session
-BuildRequires: CASA-devel control-center2-devel gnome-common gnome-desktop-devel gnome-keyring gnome-patch-translation intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files
+BuildRequires: CASA-devel control-center2-devel gnome-common gnome-desktop-devel gnome-keyring gnome-patch-translation hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files
# for xrdb resp. rsh checks:
BuildRequires: rsh xorg-x11
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
-Version: 2.16.1
-Release: 49
+Version: 2.17.91
+Release: 1
Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2
Source1: gnome
@@ -37,6 +37,8 @@ Patch24: gnome-session-dist-splash.patch
Patch26: gnome-session-compiz.patch
Patch27: gnome-session-migrate-session-manual.patch
Patch29: gnome-session-wm-switch.patch
+# FIXME: This doesn't apply. Somebody should go through it and
+# make it apply.
Patch30: gnome-session-tile-ui.patch
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,6 +49,7 @@ Recommends: control-center2
Requires: control-center2
%endif
Obsoletes: gnome-core
+Requires: hicolor-icon-theme
%gconf_schemas_prereq
@@ -78,11 +81,11 @@ gnome-patch-translation-prepare
%if %suse_version > 1000
%patch21 -p1
%patch22
-%patch24
+%patch24 -p0
%patch26
%patch27 -p1
%patch29
-%patch30 -p1
+# %patch30 -p1
%endif
gnome-patch-translation-update
@@ -123,15 +126,85 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{_datadir}/applications/session-properties.desktop
%{_datadir}/gnome/default.session
-%{_datadir}/gnome/default.wm
+# %{_datadir}/gnome/default.wm
%{_datadir}/pixmaps/*
%{_datadir}/xsessions/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.*
%doc %{_mandir}/man?/*.*
%if %suse_version <= 1020
%dir %{_datadir}/xsessions
%endif
%changelog
+* Thu Mar 08 2007 - maw@suse.de
+- Update to version 2.17.91.
+ Session Properties Dialog
+ * Update categories in the .desktop file for the new control center
+ (Vincent)
+ * Use new icon (Vincent)
+ * Fix priority order of autostart desktop files with the same name
+ (Vincent)
+ * Report connection errors more gracefully (Tom Tromey)
+ * Use GOption (Vincent)
+ * Reuse existing desktop files instead of overwriting them (Vincent)
+ * Rework code of edition of startup programs so that it actually works
+ well and comply with the freedesktop spec (Vincent)
+ * Use a toggle button to enable/disable startup programs (Vincent)
+ * Add a "Save current session" button (Josselin Mouette)
+ * Remove "ask to save" toggle button (Josselin Mouette)
+ * Remove edition of session names (Vincent)
+ * Remove splash screen toggle button (Vincent)
+ * Change order of the tabs (Vincent)
+ * Fix desktop file to use a correct icon (Vincent)
+ * Improve default size of the dialog (Vincent)
+ * Show names instead of commands for the startup programs (Vincent)
+ * HIGify quit dialog (Michael Terry, Vincent)
+ Session Manager
+ * Warn the user about more fatal errors (Tom Tromey)
+ * Use gtk-window-decorator for compiz (Vincent)
+ * Fix crash when two at-spi-registryd are running (Li Yuan)
+ * Don't hardcode start of assistive technologies software (Ariel Rios,
+ Vincent)
+ * Start the dbus daemon if it's not running (Julio M. Merino Vidal)
+ * Kill esd on exit (Loïc Minier)
+ * Fix priority order of autostart desktop files with the same name
+ (Vincent)
+ * Fix invalid use of memory (Tom Tromey)
+ * Fix quoting of commands when migration to new autostart system
+ (Tom Tromey)
+ * Increase timeout for starting at-spi-registryd. This should prevent
+ showing a window warning that accessibility won't work on slow
+ machines. (Frédéric Crozat)
+ * Hardcode start of assistive technologies software again since the
+ control center won't be ready for this in 2.18 (Vincent)
+ * Kill the clients in reverse order of priority, which makes logging
+ out a better experience (metacity is killed last) (Tom Tromey)
+ * Remove useless code (Claudio Saavedra)
+ * Fix bug where clicking logout button doesn't work if
+ mouse pointer happens to be on top of the button when
+ the window is mapped (bug 52047) (Ray Strode)
+ * Make treview searching search the right column
+ (Brent Smith)
+ * Get rid of init as the parent of all processes
+ (Tom Tromey)
+ * Add fading effect for the splash screen icons
+ (Daniel Godás)
+ * Add command line option to avoid confirmation dialog
+ on kill (William McCann)
+ * Add fvwm support (Ken Deeter)
+ * Add support for compiz (Vincent)
+ * Do less work if $WINDOW_MANAGER is set (Vincent)
+ * Set http_proxy variable correctly (Ray Strode)
+ * Don't set http_proxy variable at all if the proxy
+ requires authentication (Ray Strode)
+ * Don't pop up useless dialog when saving session (Tom Tromey)
+ * Accept Enter key to close dialog when editing a session/startup
+ program (Tom Tromey)
+ * Set http_proxy environment variable based on GNOME settings
+ for legacy apps (Ray Strode)
+ * Launch at-spi-registryd for accessibility (Ariel Ros)
+ * Improve gnome-session-remove command line handling (Tom Tromey)
+ * Use Program instead of Command in the capplet (Tom Tromey)
* Fri Mar 02 2007 - sbrabec@suse.cz
- Do not own /usr/share/xsessions (#229172).
* Mon Feb 12 2007 - cgaisford@novell.com