OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=65

gnome-session-compiz-as-default-wm.patch

@@ -13,15 +13,17 @@ Index: data/gnome-wm
  install-data-local:
 --- data/gnome-wm
 +++ data/gnome-wm
-@@ -73,6 +73,12 @@
+@@ -73,6 +73,14 @@
  
    if [ -f "$COMPIZ_ENABLED_FILE" ] ; then
      KNOWN_WM="compiz-manager $KNOWN_WM"
 +  else
++      if [ ! -f "$HOME/.config/compiz/disable-compiz" ] ; then
 +         # Check to see if hardware is supported by compiz, to have it as default WM if so
 +         CM_DRY=yes compiz-manager > /dev/null 2>&1
 +         if test $? -eq 0; then
 +	     KNOWN_WM="compiz-manager $KNOWN_WM"
++         fi
 +      fi
    fi
  

gnome-session.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 28 14:05:23 CEST 2008 - rodrigo@novell.com
+
+- Update gnome-session-compiz-as-default-wm.patch to not try
+  starting compiz if the ~/.config/compiz/disable-compiz file
+  exists (bnc#436873)
+
 -------------------------------------------------------------------
 Wed Oct 22 15:02:52 CDT 2008 - maw@suse.de
 

gnome-session.spec

@@ -38,7 +38,7 @@ BuildRequires:  update-desktop-files
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/GUI/GNOME
 Version:        2.24.1
-Release:        1
+Release:        2
 Summary:        Session Tools for the GNOME 2.x Desktop
 Url:            http://www.gnome.org
 Source:         %{name}-%{version}.tar.bz2
@@ -195,7 +195,11 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}-2.0.lang
 
 %changelog
-* Wed Oct 22 2008 maw@suse.de
+* Tue Oct 28 2008 rodrigo@novell.com
+- Update gnome-session-compiz-as-default-wm.patch to not try
+  starting compiz if the ~/.config/compiz/disable-compiz file
+  exists (bnc#436873)
+* Thu Oct 23 2008 maw@suse.de
 - Update to version 2.24.1:
   + Add GTK and GNOME categories to session-properties.desktop
   + Fix leaks
@@ -211,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 - added prototype
 * Mon Oct 06 2008 sbrabec@suse.cz
 - Conflict with other branding providers (FATE#304881).
-* Tue Sep 23 2008 maw@suse.de
+* Wed Sep 24 2008 maw@suse.de
 - Update to version 2.24.0:
   + Convert the username to UTF-8 in the logout dialog
   + Fix leaks
@@ -366,7 +370,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jun 03 2008 rodrigo@suse.de
 - Export SDL_AUDIODRIVER=pulse in gnome startup script to have
   SDL applications use PulseAudio when in GNOME (bnc#394721)
-* Fri May 23 2008 sreeves@suse.de
+* Sat May 24 2008 sreeves@suse.de
 - Update the "gnome" script to not start gpk-update-icon on live install
   BNC #390658
 * Mon May 19 2008 sbrabec@suse.cz
@@ -403,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT
   performance issue when launching new apps in GNOME on a default
   beta1 install -- extreme slowness can happen depending on the
   network setup. Fix bnc#385150, patch by Michael Meeks.
-* Tue Apr 29 2008 vuntz@suse.de
+* Wed Apr 30 2008 vuntz@suse.de
 - Actually copy the right live-installer.desktop (instead of a
   non-existing file) in gnome script so the installer icon appears
   on the desktop.
@@ -438,7 +442,7 @@ rm -rf $RPM_BUILD_ROOT
   + Updated translations
 * Mon Mar 10 2008 sbrabec@suse.cz
 - Require bug-buddy and its bi-arch counterpart (bnc#354164).
-* Tue Mar 04 2008 maw@suse.de
+* Wed Mar 05 2008 maw@suse.de
 - Update to version 2.21.92:
   + Require recent versions of gnome-keyring
   + Correctly handle the env. variables given by gnome-keyring to
@@ -461,7 +465,7 @@ rm -rf $RPM_BUILD_ROOT
 - Remove gnome-session-splash-screen.diff its obsoleted by bgo116814
   (originally bnc5780)
 - Remove handling of SUSE Linux 10.0 in the spec, its EOL
-* Wed Jan 30 2008 maw@suse.de
+* Thu Jan 31 2008 maw@suse.de
 - Update to version 2.21.90:
   + Set orientation with randr too (Luca Cavalli)
   + Fix warnings and plug leaks
@@ -471,7 +475,7 @@ rm -rf $RPM_BUILD_ROOT
   + Change capplet title
   + HIG fixes in the capplet
   + Updated translations.
-* Thu Nov 08 2007 hpj@suse.de
+* Fri Nov 09 2007 hpj@suse.de
 - Rename gnome-session-main-init.patch to
   gnome-session-2.20.0-safe-a11y-startup.patch, and change it so
   a11y is started up before the user session, but still after
@@ -485,15 +489,15 @@ rm -rf $RPM_BUILD_ROOT
 - Updated gnome script to detect live install user and create
   desktop entires in the ~/.config/autostart directory to disable
   beagle and opensuse-updater applets.  Bug #326801
-* Wed Sep 19 2007 cgaisford@novell.com
+* Thu Sep 20 2007 cgaisford@novell.com
 - Updated gnome script to create live install desktop file if the
   system is booted into a live install configuration.  Also depends
   on an update to the gnome2-SuSE package which contains the desktop
   file.  Bug #310543
-* Tue Sep 18 2007 mauro@suse.de
+* Wed Sep 19 2007 mauro@suse.de
 - Update to version 2.20.0
   + Updated translations
-* Fri Sep 14 2007 cgaisford@novell.com
+* Sat Sep 15 2007 cgaisford@novell.com
 - Modified the gnome script to copy the SuSE.desktop file to the
   desktop which points to the greeter app #300773
 * Thu Sep 13 2007 jpr@suse.de
@@ -507,10 +511,10 @@ rm -rf $RPM_BUILD_ROOT
 - Update to versino 2.19.92:
   + Fix compiz support in gnome-wm
   + Updated translations.
-* Fri Sep 07 2007 lewing@suse.de
+* Sat Sep 08 2007 lewing@suse.de
 - Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
   runs. Part of bnc #300773
-* Thu Sep 06 2007 cgaisford@novell.com
+* Fri Sep 07 2007 cgaisford@novell.com
 - Created a patch to fix login and logout sounds in gnome-session
   Novell bug 294396 and bugzilla.gnome.org #466458
 * Tue Sep 04 2007 maw@suse.de
@@ -520,7 +524,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 31 2007 maw@suse.de
 - Update to version 2.19.90:
   + Updated translations.
-* Tue Aug 28 2007 cgaisford@novell.com
+* Wed Aug 29 2007 cgaisford@novell.com
 - Further testing showed that the a11y needs to be done much lower
   in the loop so I've moved it down right before the gtk-main
 * Mon Aug 27 2007 cgaisford@novell.com
@@ -532,13 +536,13 @@ rm -rf $RPM_BUILD_ROOT
   if they are not available.  Fix for Novell Bug 238299
 - Included patch to fix up load time that is pending review
   upstream.  I'll add it to the spec file once approved
-* Tue Aug 07 2007 maw@suse.de
+* Wed Aug 08 2007 maw@suse.de
 - Use %%fdupes
 - Split off a -lang subpackage.
-* Fri Aug 03 2007 dreveman@suse.de
+* Sat Aug 04 2007 dreveman@suse.de
 - Update for compiz 0.5.2, which need glib plugin to be loaded
   before gconf plugin.
-* Thu Aug 02 2007 cgaisford@suse.de
+* Fri Aug 03 2007 cgaisford@suse.de
 - Fixed up the tile-ui patch to work with the new gnome
 * Thu Aug 02 2007 maw@suse.de
 - Update to version 2.19.6:
@@ -644,7 +648,7 @@ rm -rf $RPM_BUILD_ROOT
   * Yang Zhang (zh_CN)
 * Wed Apr 04 2007 sbrabec@suse.cz
 - Session start script (gnome) cleanup (#254439).
-* Tue Apr 03 2007 jhargadon@suse.de
+* Wed Apr 04 2007 jhargadon@suse.de
 - specfile cleanup (#255906)
 * Mon Mar 19 2007 jpr@suse.de
 - Update to 2.18.0
@@ -658,7 +662,7 @@ rm -rf $RPM_BUILD_ROOT
   * Translations
 * Wed Mar 14 2007 sbrabec@suse.cz
 - Fixed at-spi-registryd path (#254403).
-* Thu Mar 08 2007 maw@suse.de
+* Fri Mar 09 2007 maw@suse.de
 - Update to version 2.17.91.
   Session Properties Dialog
   * Update categories in the .desktop file for the new control center
@@ -729,19 +733,19 @@ rm -rf $RPM_BUILD_ROOT
   * 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
+* Tue Feb 13 2007 cgaisford@novell.com
 - updated the UI from changes make in SLED.
-* Sun Jan 07 2007 sbrabec@suse.cz
+* Mon Jan 08 2007 sbrabec@suse.cz
 - Prefix changed to /usr.
 - Spec file cleanup.
-* Fri Dec 22 2006 federico@novell.com
+* Sat Dec 23 2006 federico@novell.com
 - Removed the part of /usr/bin/gnome that overwrites the
   /desktop/gnome/font_rendering/dpi setting in GConf upon the user's
   first login.  With an updated control-center2 package,
   gnome-settings-daemon will take care of figuring out the right DPI
   value.  Fixes the gnome-session part of
   https://bugzilla.novell.com/show_bug.cgi?id=217790.
-* Sat Oct 14 2006 danw@suse.de
+* Sun Oct 15 2006 danw@suse.de
 - Remove dead patches
 - Update and re-enable gnome-session-remove-dns-warning.patch
 * Fri Oct 13 2006 dreveman@suse.de
@@ -759,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
 - update to version 2.16.0
 - Updated splash screen
 - translation updates
-* Wed Aug 30 2006 jhargadon@suse.de
+* Thu Aug 31 2006 jhargadon@suse.de
 - update to version 2.15.92
 - Fix crash caused by debug output on Solaris
 - translation updates
@@ -778,27 +782,27 @@ rm -rf $RPM_BUILD_ROOT
 - Fix edition of startup programs containing a space in a command line
   argument
 - Add gnome-keyring dependency
-* Tue Aug 01 2006 danw@suse.de
+* Wed Aug 02 2006 danw@suse.de
 - If the session explicitly specifies metacity or compiz, but
   the "wrong" X server for that wm is running, switch back to
   gnome-wm. #180506
 * Fri Jun 16 2006 danw@suse.de
 - Pass --replace to compiz and gnome-window-decorator in case the
   copies run by gdm don't exit properly. #185296
-* Mon Jun 12 2006 rodrigo@suse.de
+* Tue Jun 13 2006 rodrigo@suse.de
 - Added patch to create ~/.config/autostart before starting the
   migration from previous versions (#169509)
 * Fri Jun 02 2006 gekker@suse.de
 - Fix pager on upgrade (#181264)
-* Wed May 31 2006 jpr@suse.de
+* Thu Jun 01 2006 jpr@suse.de
 - Don't run the migration script for new users (#179332)
-* Wed May 24 2006 joeshaw@suse.de
+* Thu May 25 2006 joeshaw@suse.de
 - Fix the gnome script to not break when setting the background on
   multihead setups.  Patch from Erik Jacobsen.  (bnc #178388)
 * Sun May 21 2006 jpr@suse.de
 - Reset the user's UI if upgrading from NLD9/SLES9 to SLED10, leave ui
   for SLES10 upgrades (#174123)
-* Fri May 12 2006 hpj@suse.de
+* Sat May 13 2006 hpj@suse.de
 - Update keyring unlockage patch to try both CASA's
   Gnome_Keyring_Default and Desktop passwords. Part of fix for
   Novell bug #174093.
@@ -809,7 +813,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update gnome-wm to pick metacity or compiz based on whether it's
   actually running under Xgl or not, regardless of what
   /etc/sysconfig/displaymanager says. Fixes Xnest logins. #170839.
-* Tue May 02 2006 joeshaw@suse.de
+* Wed May 03 2006 joeshaw@suse.de
 - Don't write out a font using raw XML to the gconf database,
   that's wrong and evil.  Instead, try to set the desktop's DPI
   value using gconftool-2.  (bnc #171096)
@@ -822,14 +826,14 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 13 2006 sbrabec@suse.cz
 - Call %%suse_update_desktop_file.
 - Use new control-center Categories instead of old ones.
-* Fri Apr 07 2006 danw@suse.de
+* Sat Apr 08 2006 danw@suse.de
 - Patch gnome-wm to prefer compiz when Xgl is running
 * Wed Apr 05 2006 hpj@suse.de
 - Fix keyring unlock patch to use g_strlcpy() correctly again.
   Fixes bug #159593 together with a CASA fix.
 * Fri Mar 31 2006 rodrigo@suse.de
 - Added missing "/" for /etc/xdg/autostart searching (#161322)
-* Mon Mar 27 2006 jpr@suse.de
+* Tue Mar 28 2006 jpr@suse.de
 - Handle only shipping 2 sizes of backgrounds
 * Tue Mar 21 2006 rodrigo@suse.de
 - Added support for /etc/xdg/autostart directory, so that
@@ -846,7 +850,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed gnome-session-default-applications.patch, all needed
   applications are now started, if installed, via the autostart
   mechanism.
-* Mon Mar 06 2006 rodrigo@suse.de
+* Tue Mar 07 2006 rodrigo@suse.de
 - Fixed support for multiple system autostart directories.
 - Disable GUI operations for system-wide files (#154755).
 * Thu Mar 02 2006 rodrigo@suse.de
@@ -854,7 +858,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use g_strlcpy instead of strcpy when copying passwords.
 * Wed Feb 22 2006 rodrigo@suse.de
 - Added gnome-session-gsd-early-start.patch that fixes #150256.
-* Thu Feb 16 2006 rodrigo@suse.de
+* Fri Feb 17 2006 rodrigo@suse.de
 - Don't try to remove non-existing files (#145870)
 * Thu Feb 16 2006 rodrigo@suse.de
 - Updated gnome-session-suspend-patch to make suspend work as
@@ -867,7 +871,7 @@ rm -rf $RPM_BUILD_ROOT
 - Remove the beagled invocation from the /usr/X11R6/bin/gnome
   shell script; it gets invoked through the new autostart
   mechanism now.  (bnc #150041)
-* Wed Feb 08 2006 rodrigo@suse.de
+* Thu Feb 09 2006 rodrigo@suse.de
 - Updated gnome-session-suspend.patch to not exit the X session
   when suspend is selected on the logout dialog (117491)
 * Wed Feb 08 2006 joeshaw@suse.de
@@ -880,10 +884,10 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 06 2006 hpj@suse.de
 - Fixed gnome-keyring-unlock patch to give correct soname for
   casa.
-* Sun Feb 05 2006 hpj@suse.de
+* Mon Feb 06 2006 hpj@suse.de
 - Updated gnome-keyring-unlock patch with dlopen hack from CASA
   team. I have no idea why this is required.
-* Sun Feb 05 2006 ro@suse.de
+* Mon Feb 06 2006 ro@suse.de
 - make it build on x86_64 (adding libdir to CASA unlock patch)
 * Fri Feb 03 2006 rodrigo@suse.de
 - Added gnome-session-rdesktop.diff, that fixes hang on login when
@@ -896,7 +900,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jan 28 2006 hpj@suse.de
 - Added patch to unlock default GNOME keyring using the CASA
   password, optionally creating it if it doesn't exist.
-* Thu Jan 26 2006 hpj@suse.de
+* Fri Jan 27 2006 hpj@suse.de
 - Set the ICEAUTHORITY env var so programs running as root can
   get to the cookies. Eliminates hangs on logout.
 * Wed Jan 25 2006 mls@suse.de
@@ -918,7 +922,7 @@ rm -rf $RPM_BUILD_ROOT
 - Updated autostart patch that includes code to migrate from the
   old ~/.gnome2/session-manual to the .desktop file-based thing
   in the user's home directory.
-* Sat Jan 07 2006 dreveman@suse.de
+* Sun Jan 08 2006 dreveman@suse.de
 - Improved logout effect patch
 * Thu Jan 05 2006 rodrigo@suse.de
 - Small fix to previous patch to avoid crash.
@@ -984,9 +988,9 @@ rm -rf $RPM_BUILD_ROOT
 - Update splash for 10.0
 * Tue Aug 09 2005 rodrigo@suse.de
 - Update to 2.11.91, which includes fix for #102652
-* Fri Aug 05 2005 gekker@suse.de
+* Sat Aug 06 2005 gekker@suse.de
 - Start gnome-volume-manager with session
-* Wed Aug 03 2005 gekker@suse.de
+* Thu Aug 04 2005 gekker@suse.de
 - Start beagle by default, disable with ~/.dontrunbeagle
 * Tue Aug 02 2005 gekker@suse.de
 - Update to 2.11.90
@@ -1005,7 +1009,7 @@ rm -rf $RPM_BUILD_ROOT
 - Don't run beagle unless ~/.runbeagle exists (#74029)
 * Sat Mar 19 2005 jody@suse.de
 - Enable suspend if it is available. (#73000)
-* Thu Mar 17 2005 clahey@suse.de
+* Fri Mar 18 2005 clahey@suse.de
 - Patch fixes freeze on login.
 * Wed Mar 16 2005 sbrabec@suse.cz
 - Fixed gnome-session-desktop-file.patch (#73047).
@@ -1016,7 +1020,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Mar 07 2005 gekker@suse.de
 - mv suseplugger to default-apps patch
 - launch netapplet, resapplet, and best on startup
-* Fri Feb 25 2005 gekker@suse.de
+* Sat Feb 26 2005 gekker@suse.de
 - Add launch wrapper to launch beagled if installed in file gnome
 * Wed Feb 09 2005 sbrabec@suse.cz
 - Added session desktop file.
@@ -1047,7 +1051,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep 10 2004 hhetter@suse.de
 - run use_default_session again to make the 9.2 distribution
   wallpapers accessible
-* Thu Sep 09 2004 federico@ximian.com
+* Fri Sep 10 2004 federico@ximian.com
 - Added gnome-session-remove-purge-timeout.diff, to fix
   http://bugzilla.gnome.org/show_bug.cgi?id=151664
 - Changed gnome-session-suseplugger.patch to run suseplugger with
@@ -1062,22 +1066,22 @@ rm -rf $RPM_BUILD_ROOT
 - Fixes bug #61567
   kdm shows 'Reboot' and 'Shutdown' options at the time
   of logout.
-* Thu Aug 05 2004 clahey@suse.de
+* Fri Aug 06 2004 clahey@suse.de
 - Added gnome-session-remove-dns-warning.patch from Federico.
 * Fri Jul 16 2004 shprasad@suse.de
 - Fixes bug #59918
   Hides the splash-screen once the difault setting gets loaded.
 * Thu Jul 08 2004 sbrabec@suse.cz
 - Added DESKTOP_LAUNCH patch from Jan Holesovsky.
-* Fri Jun 18 2004 dave@suse.de
+* Sat Jun 19 2004 dave@suse.de
 - Don't set the wallpaper or font in the gnome startup script.
-* Fri Jun 11 2004 clahey@suse.de
+* Sat Jun 12 2004 clahey@suse.de
 - Added gnome-session-use-gdmctl.patch.
-* Thu Jun 03 2004 clahey@suse.de
+* Fri Jun 04 2004 clahey@suse.de
 - Switch to Novell session splash screen.
-* Wed Jun 02 2004 mibarra@suse.de
+* Thu Jun 03 2004 mibarra@suse.de
 - Make GNOME use suseplugger
-* Tue May 11 2004 clahey@suse.de
+* Wed May 12 2004 clahey@suse.de
 - Added gnome-session-2.0.5-dithering.patch to use MAX dithering.
 - Added gnome-session-desktop-file.patch to make gnome-session show
   up in control-center.
@@ -1136,7 +1140,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed distribution desktop files.
 * Wed May 28 2003 sbrabec@suse.cz
 - Compress manpages.
-* Tue May 27 2003 ro@suse.de
+* Wed May 28 2003 ro@suse.de
 - added manpages to filelist
 * Tue Mar 18 2003 sbrabec@suse.cz
 - Variables already set in profile files removed from session startup
@@ -1173,7 +1177,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added libjpeg to neededforbuild.
 * Thu Nov 28 2002 hhetter@suse.de
 - updated to version 2.0.9 [GNOME 2.0.3]
-* Mon Nov 11 2002 ro@suse.de
+* Tue Nov 12 2002 ro@suse.de
 - changed neededforbuild <xf86 xdevel> to <x-devel-packages>
 * Wed Nov 06 2002 hhetter@suse.de
 - use correct kde-datadir
@@ -1223,7 +1227,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jun 20 2002 hhetter@suse.de
 - updated to version 2.0.1
 - don't install schemas while make install
-* Sun Jun 16 2002 ro@suse.de
+* Mon Jun 17 2002 ro@suse.de
 - use libpng-devel-packages in neededforbuild
 * Fri Jun 14 2002 hhetter@suse.de
 - provide schema file