Hello community,
here is the log from the commit of package gnome-session for openSUSE:Factory
checked in at Fri Jul 31 19:35:29 CEST 2009.
--------
--- GNOME/gnome-session/gnome-session.changes 2009-05-25 16:24:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2009-07-29 13:59:00.000000000 +0200
@@ -1,0 +2,60 @@
+Wed Jul 29 12:21:04 CEST 2009 - vuntz@novell.com
+
+- Update to version 2.27.5:
+ + Prefer compiz-manager over compiz when available in gnome-wm
+ + Add --with-default-wm configure option to let distributors
+ specify the default window manager they want to use (including
+ gnome-wm)
+ + Use silent-rules with automake 1.11
+ + Add --enable-splash configure option to build splash, and
+ disable splash build by default
+ + Add Presence interface to the documentation
+ + Do not exit when the system bus restarts
+ + Port from gnome-power-manager to DeviceKit-power
+ DeviceKit-power is a new dependency.
+ + Code cleanup
+ + Updated translations.
+- Add DeviceKit-power-devel BuildRequires.
+- Pass --with-default-wm=gnome-wm to configure.
+- Provides and Obsoletes branding package, and remove
+ branding-upstream package as we don't ship the splash anymore.
+- Remove splash-related packaging.
+- Respin gnome-session-bgo507101-tile-ui.patch.
+- Remove gnome-session-gnome-wm-compiz-manager.patch and
+ gnome-session-compiz-as-default-wm.patch, and replace them with
+ gnome-session-enable-disable-compiz.patch.
+
+-------------------------------------------------------------------
+Mon Jul 20 11:50:15 CEST 2009 - vuntz@novell.com
+
+- Update to version 2.27.4:
+ + Reduce GConf roundtrips
+ + Use shave to improve build log readability
+ + Fix a crash on Solaris
+ + Generate docs for the presence API
+ + Rewrite a good part of the capplet. Some highlights:
+ - much cleaner code
+ - monitor autostart files
+ - autofill name field if needed
+ - add help button
+ - better handling of themed and non-themed application icons
+ - allow dragging from the application list
+ - make it more clear that applications are disabled
+ + Port to GtkBuilder
+ + Improve debug message
+ + Load default apps after saved and autostart apps
+ + Build fixes for BSD
+ + Update eggsmclient code to fix crash
+ + Add mutter support to gnome-wm
+ + Make gnome-session exit properly on reboot/shutdown
+ + Avoid pointless warnings
+ + Honour the SmRestartNever SmRestartStyleHint
+ + Default clients to RESTART_IF_RUNNING instead of NEVER
+ + Code cleanups
+ + Updated translations.
+- Rebase gnome-session-bgo507101-tile-ui.patch.
+- Rebase gnome-session-gnome-wm-compiz-manager.patch.
+- Remove libglade2-devel BuildRequires.
+- Use gnome-autogen.sh instead of autoreconf to make it work.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-session-2.26.1.tar.bz2
gnome-session-compiz-as-default-wm.patch
gnome-session-gnome-wm-compiz-manager.patch
New:
----
gnome-session-2.27.5.tar.bz2
gnome-session-enable-disable-compiz.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.zMuOqw/_old 2009-07-31 19:33:08.000000000 +0200
+++ /var/tmp/diff_new_pack.zMuOqw/_new 2009-07-31 19:33:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-session (Version 2.26.1)
+# spec file for package gnome-session (Version 2.27.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,6 +20,7 @@
Name: gnome-session
BuildRequires: PolicyKit-gnome-devel
+BuildRequires: DeviceKit-power-devel
BuildRequires: gnome-common
BuildRequires: fdupes
BuildRequires: gconf2-devel
@@ -27,13 +28,12 @@
BuildRequires: gnome-settings-daemon-devel
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
-BuildRequires: libglade2-devel
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
-License: GPL v2 or later; LGPL v2.1 or later
+License: GPL v2 or later ; LGPL v2.1 or later
Group: System/GUI/GNOME
-Version: 2.26.1
-Release: 2
+Version: 2.27.5
+Release: 1
Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org
Source: %{name}-%{version}.tar.bz2
@@ -49,10 +49,8 @@
Patch2: gnome-session-wm-switch.patch
# PATCH-FIX-UPSTREAM gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz@novell.com -- Tile UI for logout dialog.
Patch3: gnome-session-bgo507101-tile-ui.patch
-# PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz@novell.com -- Launch compiz-manager when configured.
-Patch4: gnome-session-gnome-wm-compiz-manager.patch
-# PATCH-FEATURE-OPENSUSE gnome-session-compiz-as-default-wm.patch fate304762 rodrigo@novell.com -- Run compiz as default WM whenever possible
-Patch6: gnome-session-compiz-as-default-wm.patch
+# PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm
+Patch4: gnome-session-enable-disable-compiz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: gnome-core
Requires: dbus-1-x11
@@ -62,8 +60,10 @@
Recommends: gnome-settings-daemon
Recommends: metacity
Recommends: nautilus
-Requires: %{name}-branding
Requires: %{name}-lang = %{version}
+# There's no splash anymore, so no branding package.
+Provides: %{name}-branding = %{version}
+Obsoletes: %{name}-branding <= %{version}
%gconf_schemas_prereq
%description
@@ -79,32 +79,6 @@
Ralph Mor, X Consortium
-%package branding-upstream
-License: GPL v2 or later; LGPL v2.1 or later
-Summary: Session Tools for the GNOME 2.x Desktop
-Group: System/GUI/GNOME
-Provides: %{name}-branding = %{version}
-Conflicts: otherproviders(%{name}-branding)
-Supplements: packageand(%{name}:branding-upstream)
-#BRAND: gnome-splash.png: Splash screen. Bottom 70 pixels are used for
-#BRAND: "just starting" icons. This area is bright in the original
-#BRAND: branding. Must be png or change system gconf key
-#BRAND: /apps/gnome-session/options/splash_image
-#BRAND: Upstream uses 420x293 pixels in GNOME 2.20.
-
-%description branding-upstream
-This package provides the basic session tools, like session management
-functionality, for the GNOME 2.x Desktop.
-
-
-
-Authors:
---------
- Tom Tromey
- Felix Bellaby
- Ralph Mor, X Consortium
-
-
%lang_package
%prep
%setup -q
@@ -115,13 +89,13 @@
#%patch2 -p1
%patch3 -p0
%patch4 -p1
-%patch6 -p0
gnome-patch-translation-update
%build
-autoreconf -f -i
+NOCONFIGURE=1 gnome-autogen.sh
%configure \
- --with-at-spi-registryd-directory=%{_prefix}/lib/at-spi
+ --with-at-spi-registryd-directory=%{_prefix}/lib/at-spi \
+ --with-default-wm=gnome-wm
%__make %{?jobs:-j%jobs}
%install
@@ -133,13 +107,7 @@
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/xsessions
install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
install -m644 %{S:7} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/
-# Temporary workaround to not have to own /usr/share/gnome/autostart. Upstream
-# will move the file in the right directory.
-install -d %{buildroot}%{_sysconfdir}/xdg/autostart
-mv %{buildroot}%{_datadir}/gnome/autostart/*.desktop %{buildroot}%{_sysconfdir}/xdg/autostart
-# end of workaround
%suse_update_desktop_file at-spi-registryd-wrapper
-%suse_update_desktop_file gnome-session-splash
%suse_update_desktop_file gnome-settings-daemon-helper
%suse_update_desktop_file gnome-wm
%suse_update_desktop_file session-properties X-SuSE-ControlCenter-System
@@ -147,12 +115,15 @@
%find_lang %{name}-2.0
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
+# Temporary workaround: still installed by the package
+rm -f %{buildroot}%{_datadir}/pixmaps/splash/gnome-splash.png
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
+
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
@@ -167,13 +138,8 @@
%{_datadir}/xsessions/*.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/icons/hicolor/*/*/*.*
-%dir %{_datadir}/pixmaps/splash
%doc %{_mandir}/man?/*.*
-%files branding-upstream
-%defattr (-, root, root)
-%{_datadir}/pixmaps/splash/gnome-splash.png
-
%files lang -f %{name}-2.0.lang
## ha/ig does not exist in Factory currently
##%if %suse_version <= 1110
++++++ gnome-session-2.26.1.tar.bz2 -> gnome-session-2.27.5.tar.bz2 ++++++
++++ 96266 lines of diff (skipped)
++++++ gnome-session-bgo507101-tile-ui.patch ++++++
--- /var/tmp/diff_new_pack.zMuOqw/_old 2009-07-31 19:33:10.000000000 +0200
+++ /var/tmp/diff_new_pack.zMuOqw/_new 2009-07-31 19:33:10.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- gnome-session/gsm-manager.c.orig
+++ gnome-session/gsm-manager.c
-@@ -2363,7 +2363,8 @@ logout_dialog_response (GsmLogoutDialog
+@@ -2748,7 +2748,8 @@ logout_dialog_response (GsmLogoutDialog
{
g_debug ("GsmManager: Logout dialog response: %d", response_id);
@@ -12,7 +12,7 @@
/* In case of dialog cancel, switch user, hibernate and
* suspend, we just perform the respective action and return,
-@@ -2373,6 +2374,10 @@ logout_dialog_response (GsmLogoutDialog
+@@ -2758,6 +2759,10 @@ logout_dialog_response (GsmLogoutDialog
case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT:
break;
@@ -35,7 +35,7 @@
#include
#include
#include
-@@ -292,3 +293,75 @@ gsm_util_setenv (const char *variable,
+@@ -503,3 +504,75 @@ gsm_util_setenv (const char *variable,
g_error_free (bus_error);
}
}
@@ -123,9 +123,9 @@
G_BEGIN_DECLS
-@@ -37,6 +38,9 @@ char * gsm_util_generate_startup_id
- void gsm_util_setenv (const char *variable,
- const char *value);
+@@ -47,6 +48,9 @@ char * gsm_util_generate_startup_id
+ void gsm_util_setenv (const char *variable,
+ const char *value);
+void gsm_util_help_display (GtkWindow *parent,
+ const char * link_id);
@@ -142,14 +142,14 @@
-DDBUS_LAUNCH=\"dbus-launch\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\""$(datadir)"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
+ -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \
-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
+ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \
Index: gnome-session/gsm-logout-dialog.c
===================================================================
--- gnome-session/gsm-logout-dialog.c.orig
+++ gnome-session/gsm-logout-dialog.c
-@@ -37,8 +37,13 @@
+@@ -38,8 +38,13 @@
#define AUTOMATIC_ACTION_TIMEOUT 60
@@ -165,13 +165,13 @@
typedef enum {
GSM_DIALOG_LOGOUT_TYPE_LOGOUT,
-@@ -47,11 +52,12 @@ typedef enum {
+@@ -48,11 +53,12 @@ typedef enum {
struct _GsmLogoutDialogPrivate
{
- GsmDialogLogoutType type;
-
- GsmPowerManager *power_manager;
+ DkpClient *dkp_client;
GsmConsolekit *consolekit;
+ GtkWidget *info_label;
@@ -180,7 +180,7 @@
int timeout;
unsigned int timeout_id;
-@@ -60,7 +66,8 @@ struct _GsmLogoutDialogPrivate
+@@ -61,7 +67,8 @@ struct _GsmLogoutDialogPrivate
static GsmLogoutDialog *current_dialog = NULL;
@@ -190,7 +190,7 @@
static void gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog,
gpointer data);
-@@ -68,43 +75,10 @@ static void gsm_logout_dialog_destroy (
+@@ -69,43 +76,10 @@ static void gsm_logout_dialog_destroy (
static void gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog,
gpointer data);
@@ -237,7 +237,7 @@
static void
gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass)
-@@ -113,18 +87,6 @@ gsm_logout_dialog_class_init (GsmLogoutD
+@@ -114,18 +88,6 @@ gsm_logout_dialog_class_init (GsmLogoutD
gobject_class = G_OBJECT_CLASS (klass);
@@ -256,7 +256,7 @@
g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate));
}
-@@ -146,11 +108,23 @@ gsm_logout_dialog_init (GsmLogoutDialog
+@@ -137,11 +99,23 @@ gsm_logout_dialog_init (GsmLogoutDialog
logout_dialog->priv->timeout_id = 0;
logout_dialog->priv->timeout = 0;
logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
@@ -278,10 +278,10 @@
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
- logout_dialog->priv->power_manager = gsm_get_power_manager ();
+ logout_dialog->priv->dkp_client = dkp_client_new ();
logout_dialog->priv->consolekit = gsm_get_consolekit ();
-@@ -247,40 +221,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
+@@ -237,40 +211,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
}
static void
@@ -339,7 +339,7 @@
seconds_warning = ngettext ("You will be automatically logged "
"out in %d second.",
"You will be automatically logged "
-@@ -288,7 +250,7 @@ gsm_logout_dialog_timeout (gpointer data
+@@ -278,7 +240,7 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show);
break;
@@ -348,7 +348,7 @@
seconds_warning = ngettext ("This system will be automatically "
"shut down in %d second.",
"This system will be automatically "
-@@ -296,6 +258,10 @@ gsm_logout_dialog_timeout (gpointer data
+@@ -286,6 +248,10 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show);
break;
@@ -359,7 +359,7 @@
default:
g_assert_not_reached ();
}
-@@ -330,25 +296,50 @@ gsm_logout_dialog_timeout (gpointer data
+@@ -320,25 +286,50 @@ gsm_logout_dialog_timeout (gpointer data
secondary_text = g_strdup (seconds_warning);
}
@@ -421,7 +421,7 @@
if (logout_dialog->priv->timeout_id != 0) {
g_source_remove (logout_dialog->priv->timeout_id);
-@@ -360,13 +351,118 @@ gsm_logout_dialog_set_timeout (GsmLogout
+@@ -350,13 +341,118 @@ gsm_logout_dialog_set_timeout (GsmLogout
}
static GtkWidget *
@@ -541,7 +541,7 @@
if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog));
-@@ -376,82 +472,119 @@ gsm_get_dialog (GsmDialogLogoutType type
+@@ -366,82 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog;
++++++ gnome-session-enable-disable-compiz.patch ++++++
Index: gnome-session-2.27.5/data/gnome-wm
===================================================================
--- gnome-session-2.27.5.orig/data/gnome-wm
+++ gnome-session-2.27.5/data/gnome-wm
@@ -68,8 +68,15 @@ if [ -z "$WINDOW_MANAGER" ] ; then
# Create a list of window manager we can handle, trying to only use the
# compositing ones when it makes sense
- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
- IS_X_COMPOSITED=$?
+ if [ "x$XDG_CONFIG_HOME" = "x" ]; then
+ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable-compiz"
+ else
+ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable-compiz"
+ fi
+
+ #xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
+ #IS_X_COMPOSITED=$?
+ IS_X_COMPOSITED=0
KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
if [ $IS_X_COMPOSITED -eq 0 ] ; then
@@ -78,6 +85,18 @@ if [ -z "$WINDOW_MANAGER" ] ; then
# metacity is still the default wm in GNOME
KNOWN_WM="metacity $KNOWN_WM"
+ if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; 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
+
OLDIFS=$IFS
if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org