Hello community,
here is the log from the commit of package gnome-session
checked in at Thu Oct 12 15:17:58 CEST 2006.
--------
--- GNOME/gnome-session/gnome-session.changes 2006-10-03 18:15:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2006-10-11 20:25:09.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 11 20:23:15 CEST 2006 - danw@suse.de
+
+- Use a more explicit test for Xgl so that we don't try to run compiz
+ under Xorg when compositing isn't enabled. #197093
+- Remove some patches that were disabled with the 2.16 update that
+ are definitely no longer relevant
+
+-------------------------------------------------------------------
Old:
----
gnome-session-atk-bridge.patch
gnome-session-compiz-replace.patch
gnome-session-deadlock.patch
gnome-session-gsd-early-start.patch
gnome-session-login-sounds.patch
gnome-session-rdesktop.diff
gnome-session-use-gdmctl.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.d9Rizj/_old 2006-10-12 15:14:12.000000000 +0200
+++ /var/tmp/diff_new_pack.d9Rizj/_new 2006-10-12 15:14:12.000000000 +0200
@@ -18,37 +18,30 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
-Release: 1
+Release: 3
Summary: Session Tools for the GNOME 2.x Desktop
Source: gnome-session-%{version}.tar.bz2
Source1: gnome
Source2: gnome.desktop
Patch1: gnome-session-2.0.5-dithering.patch
Patch4: gnome-session-suspend.patch
-Patch5: gnome-session-use-gdmctl.patch
Patch6: gnome-session-DESKTOP_LAUNCH.patch
Patch7: gnome-session-splash-screen.diff
Patch8: gnome-session-remove-dns-warning.patch
Patch9: kdm-reboot-shutdown-options.diff
Patch10: gnome-session-crash.diff
-Patch11: gnome-session-deadlock.patch
Patch12: gnome-session-speedup.patch
-Patch13: gnome-session-login-sounds.patch
Patch14: gnome-session-autostart.patch
Patch15: gnome-session-disable-splash.patch
Patch16: gnome-session-2.12.0-xgl-display-modal-2.patch
-Patch17: gnome-session-atk-bridge.patch
Patch18: gnome-session-2.12.0-su-session-management.patch
Patch19: gnome-session-2.12.0-unlock-keyring.patch
-Patch20: gnome-session-rdesktop.diff
Patch21: gnome-session-2.12.0-kdm-support.patch
Patch22: gnome-session-motd.patch
-Patch23: gnome-session-gsd-early-start.patch
Patch24: gnome-session-dist-splash.patch
Patch25: gnome-session-code-review.patch
Patch26: gnome-session-compiz.patch
Patch27: gnome-session-migrate-session-manual.patch
-Patch28: gnome-session-compiz-replace.patch
Patch29: gnome-session-wm-switch.patch
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,31 +67,24 @@
gnome-patch-translation-prepare
%patch1 -p1
%patch4
-#%patch5 -p1
%patch6 -p1
%patch7 -p1
#%patch8 -p0
#%patch9
#%patch10
-#%patch11 -p1
%patch12
-#%patch13
#%patch14 -p1
#%patch15
%patch16
-#%patch17 -p1
%patch18 -p1
#%patch19 -p1
-#%patch20
%if %suse_version > 1000
%patch21 -p1
%patch22
-#%patch23
%patch24
#%patch25 -p1
%patch26
%patch27 -p1
-%patch28
%patch29
%endif
gnome-patch-translation-update
@@ -154,6 +140,11 @@
%dir /usr/share/xsessions
%changelog -n gnome-session
+* Wed Oct 11 2006 - danw@suse.de
+- Use a more explicit test for Xgl so that we don't try to run compiz
+ under Xorg when compositing isn't enabled. #197093
+- Remove some patches that were disabled with the 2.16 update that
+ are definitely no longer relevant
* Tue Oct 03 2006 - jhargadon@suse.de
- update to version 2.16.1
- Updated man pages from Debian
++++++ gnome-session-compiz.patch ++++++
--- /var/tmp/diff_new_pack.d9Rizj/_old 2006-10-12 15:14:12.000000000 +0200
+++ /var/tmp/diff_new_pack.d9Rizj/_new 2006-10-12 15:14:12.000000000 +0200
@@ -1,17 +1,17 @@
---- gnome-session/gnome-wm
-+++ gnome-session/gnome-wm
+--- 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,18 @@
IFS=":"
if [ -z "$WINDOW_MANAGER" ] ; then
if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
+
-+ if /usr/bin/glxinfo | /usr/bin/grep -q GLX_EXT_texture_from_pixmap; then
++ if /usr/bin/xdpyinfo | /usr/bin/grep -q '^vendor release number: *70000001'; then
+ if [ -x /usr/bin/gnome-window-decorator -a -x /usr/bin/compiz ]; then
-+ /usr/bin/gnome-window-decorator &
++ /usr/bin/gnome-window-decorator --replace &
+ if [ -z "$SMID" ]; then
-+ exec /usr/bin/compiz --sm-disable gconf
++ exec /usr/bin/compiz --replace --sm-disable gconf
+ else
-+ exec /usr/bin/compiz --sm-client-id $SMID gconf
++ exec /usr/bin/compiz --replace --sm-client-id $SMID gconf
+ fi
+ fi
+ fi
++++++ gnome-session-wm-switch.patch ++++++
--- /var/tmp/diff_new_pack.d9Rizj/_old 2006-10-12 15:14:13.000000000 +0200
+++ /var/tmp/diff_new_pack.d9Rizj/_new 2006-10-12 15:14:13.000000000 +0200
@@ -1,22 +1,10 @@
---- gnome-session/Makefile.am
-+++ gnome-session/Makefile.am
-@@ -28,7 +28,7 @@
- -DDATADIR=\""$(datadir)"\" \
- $(NULL)
-
--gnome_session_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS) $(LIBWRAP_LIBS) $(LIBNOTIFY_LIBS)
-+gnome_session_LDADD = -lGL $(X_LIBS) $(GNOME_SESSION_LIBS) $(LIBWRAP_LIBS) $(LIBNOTIFY_LIBS)
- gnome_session_save_LDADD = $(GNOME_SESSION_LIBS)
- gnome_session_remove_LDADD = $(GNOME_SESSION_LIBS)
- gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS)
--- gnome-session/main.c
+++ gnome-session/main.c
-@@ -44,12 +44,17 @@
- #include