pool/gnome-session
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 69076 from GNOME:Factory

Browse Source 
Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=105
This commit is contained in:
Sascha Peilicke 2011-05-04 08:14:00 +00:00 committed by Git OBS Bridge
commit 98ee512942
6 changed files with 252 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-2.32.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
size 774842

3
gnome-session-3.0.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25
size 804595

70
gnome-session-bgo507101-tile-ui.patch
View File

@ -2,9 +2,9 @@ Index: gnome-session/gsm-manager.c
=================================================================== ===================================================================
--- gnome-session/gsm-manager.c.orig --- gnome-session/gsm-manager.c.orig
+++ gnome-session/gsm-manager.c +++ gnome-session/gsm-manager.c
@@ -2804,7 +2804,8 @@ logout_dialog_response (GsmLogoutDialog @@ -2836,7 +2836,8 @@ logout_dialog_response (GsmLogoutDialog
{
g_debug ("GsmManager: Logout dialog response: %d", response_id); display = gtk_widget_get_display (GTK_WIDGET (logout_dialog));
- gtk_widget_destroy (GTK_WIDGET (logout_dialog)); - gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+ if (response_id != GTK_RESPONSE_HELP) + if (response_id != GTK_RESPONSE_HELP)
@ -12,7 +12,7 @@ Index: gnome-session/gsm-manager.c
/* In case of dialog cancel, switch user, hibernate and /* In case of dialog cancel, switch user, hibernate and
* suspend, we just perform the respective action and return, * suspend, we just perform the respective action and return,
@@ -2814,6 +2815,10 @@ logout_dialog_response (GsmLogoutDialog @@ -2846,6 +2847,10 @@ logout_dialog_response (GsmLogoutDialog
case GTK_RESPONSE_NONE: case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_DELETE_EVENT:
break; break;
@ -21,7 +21,7 @@ Index: gnome-session/gsm-manager.c
+ "gosgetstarted-73"); + "gosgetstarted-73");
+ break; + break;
case GSM_LOGOUT_RESPONSE_SWITCH_USER: case GSM_LOGOUT_RESPONSE_SWITCH_USER:
request_switch_user (manager); request_switch_user (display, manager);
break; break;
Index: gnome-session/gsm-util.c Index: gnome-session/gsm-util.c
=================================================================== ===================================================================
@ -35,7 +35,7 @@ Index: gnome-session/gsm-util.c
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
@@ -503,3 +504,75 @@ gsm_util_setenv (const char *variable, @@ -503,3 +504,86 @@ gsm_util_setenv (const char *variable,
g_error_free (bus_error); g_error_free (bus_error);
} }
} }
@ -45,10 +45,8 @@ Index: gnome-session/gsm-util.c
+ const char *link_id) + const char *link_id)
+{ +{
+ GError *error = NULL; + GError *error = NULL;
+ char *command;
+ const char *lang; + const char *lang;
+ char *uri = NULL; + char *uri = NULL;
+ GdkScreen *gscreen;
+ gboolean found; + gboolean found;
+ +
+ int i; + int i;
@ -77,16 +75,30 @@ Index: gnome-session/gsm-util.c
+ } + }
+ +
+ if (found) { + if (found) {
+ GAppInfo *app_info;
+ char *command;
+
+ if (link_id) { + if (link_id) {
+ command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); + command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL);
+ } else { + } else {
+ command = g_strconcat ("gnome-open ghelp://", uri, NULL); + command = g_strconcat ("gnome-open ghelp://", uri, NULL);
+ } + }
+ +
+ gscreen = gdk_screen_get_default (); + app_info = g_app_info_create_from_commandline (command, "gnome-open",G_APP_INFO_CREATE_NONE, &error);
+ gdk_spawn_command_line_on_screen (gscreen, command, &error); + g_free (command);
+ } else +
+ command = NULL; + if (error == NULL && app_info != NULL) {
+ GdkScreen *screen;
+ GdkAppLaunchContext *context;
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (parent));
+ context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+ g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
+
+ g_object_unref (context);
+ g_object_unref (app_info);
+ }
+ }
+ +
+ if (!found || error != NULL) { + if (!found || error != NULL) {
+ GtkWidget *d; + GtkWidget *d;
@ -108,7 +120,6 @@ Index: gnome-session/gsm-util.c
+ G_CALLBACK (gtk_widget_destroy), NULL); + G_CALLBACK (gtk_widget_destroy), NULL);
+ } + }
+ +
+ g_free (command);
+ g_free (uri); + g_free (uri);
+} +}
Index: gnome-session/gsm-util.h Index: gnome-session/gsm-util.h
@ -123,7 +134,7 @@ Index: gnome-session/gsm-util.h
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -47,6 +48,9 @@ char * gsm_util_generate_startup_id @@ -49,6 +50,9 @@ char * gsm_util_generate_startup_id
void gsm_util_setenv (const char *variable, void gsm_util_setenv (const char *variable,
const char *value); const char *value);
@ -137,7 +148,7 @@ Index: gnome-session/Makefile.am
=================================================================== ===================================================================
--- gnome-session/Makefile.am.orig --- gnome-session/Makefile.am.orig
+++ gnome-session/Makefile.am +++ gnome-session/Makefile.am
@@ -84,6 +84,10 @@ libgsmutil_la_SOURCES = \ @@ -91,6 +91,10 @@ libgsmutil_la_SOURCES = \
gsm-util.c \ gsm-util.c \
gsm-util.h gsm-util.h
@ -259,7 +270,7 @@ Index: gnome-session/gsm-logout-dialog.c
g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate));
} }
@@ -137,11 +99,23 @@ gsm_logout_dialog_init (GsmLogoutDialog @@ -137,11 +99,22 @@ gsm_logout_dialog_init (GsmLogoutDialog
logout_dialog->priv->timeout_id = 0; logout_dialog->priv->timeout_id = 0;
logout_dialog->priv->timeout = 0; logout_dialog->priv->timeout = 0;
logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
@ -267,12 +278,11 @@ Index: gnome-session/gsm-logout-dialog.c
- gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE); + gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE);
+ gtk_dialog_set_has_separator (GTK_DIALOG (logout_dialog), FALSE);
gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
gtk_window_stick (GTK_WINDOW (logout_dialog)); gtk_window_stick (GTK_WINDOW (logout_dialog));
+ /* use HIG spacings */ + /* use HIG spacings */
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), 12); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6); + gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6);
+ +
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP, + gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP,
@ -284,7 +294,7 @@ Index: gnome-session/gsm-logout-dialog.c
logout_dialog->priv->up_client = up_client_new (); logout_dialog->priv->up_client = up_client_new ();
logout_dialog->priv->consolekit = gsm_get_consolekit (); logout_dialog->priv->consolekit = gsm_get_consolekit ();
@@ -229,40 +203,28 @@ gsm_logout_supports_shutdown (GsmLogoutD @@ -229,40 +202,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
} }
static void static void
@ -342,7 +352,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("You will be automatically logged " seconds_warning = ngettext ("You will be automatically logged "
"out in %d second.", "out in %d second.",
"You will be automatically logged " "You will be automatically logged "
@@ -270,7 +232,7 @@ gsm_logout_dialog_timeout (gpointer data @@ -270,7 +231,7 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show); seconds_to_show);
break; break;
@ -351,7 +361,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("This system will be automatically " seconds_warning = ngettext ("This system will be automatically "
"shut down in %d second.", "shut down in %d second.",
"This system will be automatically " "This system will be automatically "
@@ -278,6 +240,10 @@ gsm_logout_dialog_timeout (gpointer data @@ -278,6 +239,10 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show); seconds_to_show);
break; break;
@ -362,7 +372,7 @@ Index: gnome-session/gsm-logout-dialog.c
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
@@ -312,25 +278,50 @@ gsm_logout_dialog_timeout (gpointer data @@ -312,25 +277,50 @@ gsm_logout_dialog_timeout (gpointer data
secondary_text = g_strdup (seconds_warning); secondary_text = g_strdup (seconds_warning);
} }
@ -386,12 +396,12 @@ Index: gnome-session/gsm-logout-dialog.c
+ int seconds_to_show; + int seconds_to_show;
+ +
+ logout_dialog = (GsmLogoutDialog *) data; + logout_dialog = (GsmLogoutDialog *) data;
+
- g_free (secondary_text);
+ if (!logout_dialog->priv->timeout) { + if (!logout_dialog->priv->timeout) {
+ gtk_dialog_response (GTK_DIALOG (logout_dialog), + gtk_dialog_response (GTK_DIALOG (logout_dialog),
+ logout_dialog->priv->default_response); + logout_dialog->priv->default_response);
+
- g_free (secondary_text);
+ return FALSE; + return FALSE;
+ } + }
+ +
@ -424,7 +434,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (logout_dialog->priv->timeout_id != 0) { if (logout_dialog->priv->timeout_id != 0) {
g_source_remove (logout_dialog->priv->timeout_id); g_source_remove (logout_dialog->priv->timeout_id);
@@ -342,14 +333,118 @@ gsm_logout_dialog_set_timeout (GsmLogout @@ -342,14 +332,120 @@ gsm_logout_dialog_set_timeout (GsmLogout
} }
static GtkWidget * static GtkWidget *
@ -474,8 +484,10 @@ Index: gnome-session/gsm-logout-dialog.c
+ gchar *markup; + gchar *markup;
+ GdkColor *color; + GdkColor *color;
+ GtkWidget *label; + GtkWidget *label;
+ GtkStyle *style;
+ +
+ color = &GTK_WIDGET (button)->style->fg[GTK_STATE_INSENSITIVE]; + style = gtk_widget_get_style (GTK_WIDGET (button));
+ color = &style->fg[GTK_STATE_INSENSITIVE];
+ markup = g_markup_printf_escaped ("<span size=\"small\" foreground=\"#%.2x%.2x%.2x\">%s</span>", + markup = g_markup_printf_escaped ("<span size=\"small\" foreground=\"#%.2x%.2x%.2x\">%s</span>",
+ color->red, + color->red,
+ color->green, + color->green,
@ -545,7 +557,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (current_dialog != NULL) { if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog)); gtk_widget_destroy (GTK_WIDGET (current_dialog));
@@ -359,83 +454,119 @@ gsm_get_dialog (GsmDialogLogoutType type @@ -359,83 +455,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog; current_dialog = logout_dialog;
@ -553,7 +565,7 @@ Index: gnome-session/gsm-logout-dialog.c
- -
- logout_dialog->priv->type = type; - logout_dialog->priv->type = type;
+ vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_vbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), vbox, + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), vbox,
+ FALSE, FALSE, 0); + FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+ gtk_widget_show (vbox); + gtk_widget_show (vbox);

41
gnome-session-enable-disable-compiz.patch
View File

@ -1,41 +0,0 @@
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

165
gnome-session.changes
View File

@ -1,3 +1,122 @@
-------------------------------------------------------------------
Wed Apr 27 12:43:38 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.1:
+ Updated translations.
-------------------------------------------------------------------
Tue Apr 5 15:56:28 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0:
+ Session Manager:
- Change path of GSettings schema
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 29 09:01:59 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.94:
+ Session Manager: Bump the phase timeout to 30 seconds
+ Updated translations.
- Changes from version 2.91.93:
+ Session Manager:
- Make work with latest version of the shell.
- Changes from version 2.91.92:
+ Session Manager:
- Better fatal error handling in general, including specific
handling when required components fail.
- Improve wording of fallback dialog.
- Avoid double-checking between gdm and gnome-session in
gnome-session-check-accelerated-helper.
- Switch to using seconds for idle time.
- Honor disable-log-out and disable-user-switching lockdown
settings.
- Change format of .session files in a incompatible way; this
is now documented in the gnome-session man page.
- Update gnome-session-quit man page
- Enforce the use of required components in the session.
- Deal with conflicts between Provides in different
applications by only having one provider running; this was
only working well for Provides defined in the session
definition.
- Use app-id when saving session instead of startup-id for
.desktop.
- Explicitly require gnome-shell/gnome-panel in .session files,
instead of using providers.
- Clean up saved session on logout if session is not getting
saved.
- Use "computer-fail" icon from theme instead of our own
sad-computer.
- Fix some gnome-shell/gnome-session interaction issue on
logout, when a third application cancels logout.
- Code cleanups
- Changes from version 2.91.91.3:
+ Session Manager:
- Better error message on not-found session.
- Rename gnome-session-save to gnome-session-quit.
- Fix cancel button in logout dialog.
- Increase is-accelerated runnable helper timeout.
- Fix crash when if-session autostart condition is used.
- Add gnome-session-check-accelerated to set a X property about
acceleration
- Rename gnome-session-is-accelerated to
gnome-session-check-accelerated-helper.
- Drop gnome-session-fix-autostart.patch: fixed upstream.
- Disable gnome-session-bgo507101-tile-ui.patch for now: it needs
to be rebased.
-------------------------------------------------------------------
Tue Mar 1 08:18:52 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.90.1:
+ Session Manager:
- Fix a crash happening in gdm
+ Updated translations.
- Changes from version 2.91.90:
+ Session Manager:
- Update for GSettings schemas changes
- Read default session from GSettings
- Make the current session name available via dbus
- Support autostart conditions that depend on the current
session
- Make notification-daemon a required part of the fallback
session
- Show a dialog after login the first time we fall back to
gnome-fallback
- Various fixes to shell logout/shutdown dialog
- Code cleanups
+ Misc:
- gsettings-desktop-schemas 0.1.7 is required
+ Updated translations.
- Changes from version 2.91.6:
+ Session Manager:
- Fix build with latest GTK+ 3
- Migrate to GSettings
- Add support for shell logout/shutdown dialog
- Use fallback session if required components are missing
+ Defined Sessions:
- Do not consider Gallium's softpipe and llvmpipe as
accelerated
- Do not run nautilus by default
+ Capplet:
- Migrate to GSettings
+ Misc:
- Change GETTEXT_PACKAGE to gnome-session-3.0
- Drop gnome-wm script
- Add a runtime dependency on gsettings-desktop-schemas
+ Updated sranslations.
- Add pkgconfig(librsvg-2.0) BuildRequires.
- Add notification-daemon Requires to main package as it's now
required by the fallback session.
- Add gnome-session-fix-autostart.patch: fix crash in autostart
code, taken from git.
- Add gsettings-desktop-schemas Requires to gnome-session-core.
- Remove --with-default-wm=gnome-wm and --enable-splash configure
options: they're now gone.
- Drop gnome-session-enable-disable-compiz.patch: this should now
be done another way, with fallback modes in gnome-session. See
bnc#676360.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 21 17:58:37 CET 2011 - vuntz@opensuse.org Mon Feb 21 17:58:37 CET 2011 - vuntz@opensuse.org
@ -28,6 +147,52 @@ Sun Feb 13 12:50:45 CET 2011 - vuntz@opensuse.org
english documentation is not there anymore. english documentation is not there anymore.
- Remove 2.x references in summaries and descriptions. - Remove 2.x references in summaries and descriptions.
-------------------------------------------------------------------
Thu Dec 23 16:04:46 CET 2010 - vuntz@opensuse.org
- Update to version 2.91.4:
+ Session Manager:
- Add autostart condition through GSettings
- Don't ever show inhibitor dialog if logout is forced
- Fix some issue tracking clients on logout
- Add an application restart limit
- Move the definition of a session from gconf to .desktop-like
files
- Change default session to use GNOME Shell, with a fallback to
classic GNOME
- Update for GTK+ 3 changes
- Code cleanups
+ Capplet:
- Set NoDisplay=true
- Fix inline search
- Update for GTK+ 3 changes
+ Updated translations.
- Add pkgconfig(xcomposite) and pkgconfig(gl) BuildRequires, for
the new gnome-session-is-accelerated helper.
-------------------------------------------------------------------
Fri Dec 17 13:43:32 CET 2010 - vuntz@opensuse.org
- Update to version 2.91.0:
+ Session Manager:
- Miscellaneous string fixes
- Fix for GTK+ 3 changes
+ Misc:
- Update information in README and other files
- Update man pages
- Build against GTK+ 3 by default
- Rename --enable-deprecations configure flag to
--enable-deprecation-flags
+ Updated translations.
- Move to pkgconfig()-style BuildRequires:
+ Old ones: gconf2-devel, libupower-glib-devel.
+ New ones: dbus-glib-1, gconf-2.0, glib-2.0, gtk+-3.0, ice, sm,
upower-glib, xau, xext, xrender, xtst.
- Remove gnome-settings-daemon-devel BuildRequires: it's not
needed.
- Improve summary and description.
- Rework gnome-session-bgo507101-tile-ui.patch to build with GTK+3.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 17 13:52:01 CET 2010 - dimstar@opensuse.org Wed Nov 17 13:52:01 CET 2010 - dimstar@opensuse.org

75
gnome-session.spec
View File

@ -18,8 +18,8 @@
Name: gnome-session Name: gnome-session
Version: 2.32.1 Version: 3.0.1
Release: 7 Release: 1
License: GPLv2+ License: GPLv2+
Summary: Session Tools for the GNOME Desktop Summary: Session Tools for the GNOME Desktop
Url: http://www.gnome.org Url: http://www.gnome.org
@ -35,22 +35,31 @@ Patch0: gnome-session-ice-auth-for-suid.patch
Patch1: gnome-session-kdm-support.patch Patch1: gnome-session-kdm-support.patch
# PATCH-NEEDS-REBASE gnome-session-wm-switch.patch bnc180506 danw@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Legacy sessions are not really supported anymore -- do we need to handle a similar case for current saved sessions, though? (was PATCH-FIX-OPENSUSE) # PATCH-NEEDS-REBASE gnome-session-wm-switch.patch bnc180506 danw@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Legacy sessions are not really supported anymore -- do we need to handle a similar case for current saved sessions, though? (was PATCH-FIX-OPENSUSE)
Patch2: gnome-session-wm-switch.patch Patch2: gnome-session-wm-switch.patch
# PATCH-FIX-UPSTREAM gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz@novell.com -- Tile UI for logout dialog. # PATCH-NEEDS-REBASE gnome-session-bgo507101-tile-ui.patch bgo507101 vuntz@novell.com -- Tile UI for logout dialog. (Was: PATCH-FIX-UPSTREAM)
Patch3: gnome-session-bgo507101-tile-ui.patch Patch3: gnome-session-bgo507101-tile-ui.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
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gconf-sanity-check BuildRequires: gconf-sanity-check
BuildRequires: gconf2-devel
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gnome-patch-translation BuildRequires: gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libupower-glib-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst)
Requires: %{name}-core = %{version} Requires: %{name}-core = %{version}
# Programs that are in the default session (we use Requires since Recommends # Programs that are in the default session (we use Requires since Recommends
# might make it possible for some people to get an empty gnome-session, and # might make it possible for some people to get an empty gnome-session, and
@ -59,6 +68,7 @@ Requires: gnome-panel
Requires: gnome-settings-daemon Requires: gnome-settings-daemon
Requires: metacity Requires: metacity
Requires: nautilus Requires: nautilus
Requires: notification-daemon
Recommends: %{name}-lang Recommends: %{name}-lang
Obsoletes: gnome-core Obsoletes: gnome-core
# There's no splash anymore, so no branding package. # There's no splash anymore, so no branding package.
@ -79,8 +89,9 @@ Summary: Session Manager for GNOME -- Minimal Version
Requires: ConsoleKit Requires: ConsoleKit
Requires: dbus-1-x11 Requires: dbus-1-x11
Requires: gconf-sanity-check Requires: gconf-sanity-check
Requires: gsettings-desktop-schemas >= 0.1.7
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
%gconf_schemas_prereq %glib2_gsettings_schema_requires
%description core %description core
This packages contain a minimal version of gnome-session, that can be used for This packages contain a minimal version of gnome-session, that can be used for
@ -91,21 +102,20 @@ GNOME desktop.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
gnome-patch-translation-prepare # disabled unless patches 2 or 3 are enabled
# gnome-patch-translation-prepare
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
# needs-rebase # needs-rebase
#%patch2 -p1 #%patch2 -p1
%patch3 -p0 # needs-rebase
%patch4 -p1 #%patch3 -p0
gnome-patch-translation-update # gnome-patch-translation-update
%build %build
NOCONFIGURE=1 gnome-autogen.sh NOCONFIGURE=1 gnome-autogen.sh
%configure \ %configure
--with-default-wm=gnome-wm \ %__make %{?jobs:-j%jobs} V=1
--enable-splash
%__make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
@ -122,11 +132,9 @@ install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
install -d -m755 %{buildroot}%{_datadir}/xsessions install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop
install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
%suse_update_desktop_file gnome-wm
%suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
%find_lang %{name}-2.0 %{?no_lang_C} %find_lang %{name}-3.0 %{?no_lang_C}
%find_gconf_schemas
%fdupes %{buildroot} %fdupes %{buildroot}
%clean %clean
@ -140,22 +148,17 @@ rm -rf %{buildroot}
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_postun %icon_theme_cache_postun
%pre core -f %{name}.schemas_pre
%post core %post core
%glib2_gsettings_schema_post
%icon_theme_cache_post %icon_theme_cache_post
%posttrans core -f %{name}.schemas_posttrans
%preun core -f %{name}.schemas_preun
%postun core %postun core
%glib2_gsettings_schema_postun
%icon_theme_cache_postun %icon_theme_cache_postun
%files %files
%defattr (-, root, root) %defattr (-, root, root)
%{_bindir}/gnome %{_bindir}/gnome
%{_bindir}/gnome-wm
%{_bindir}/gnome-session-properties %{_bindir}/gnome-session-properties
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/xsessions/*.desktop %{_datadir}/xsessions/*.desktop
@ -163,19 +166,27 @@ rm -rf %{buildroot}
%exclude %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %exclude %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg
%{_datadir}/gnome-session/session-properties.ui %{_datadir}/gnome-session/session-properties.ui
%doc %{_mandir}/man1/gnome-session-properties.1* %doc %{_mandir}/man1/gnome-session-properties.1*
%doc %{_mandir}/man1/gnome-wm.1* # Defined sessions (for GNOME only)
%{_datadir}/gnome-session/sessions/gnome-fallback.session
%{_datadir}/gnome-session/sessions/gnome.session
# Helper for the defined sessions
%{_libexecdir}/gnome-session-check-accelerated
%{_libexecdir}/gnome-session-check-accelerated-helper
%files core -f %{name}.schemas_list %files core
%defattr (-, root, root) %defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/gnome-session %{_bindir}/gnome-session
%{_bindir}/gnome-session-save %{_bindir}/gnome-session-quit
%{_datadir}/GConf/gsettings/gnome-session.convert
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
%dir %{_datadir}/gnome-session %dir %{_datadir}/gnome-session
%dir %{_datadir}/gnome-session/sessions
%{_datadir}/gnome-session/gsm-inhibit-dialog.ui %{_datadir}/gnome-session/gsm-inhibit-dialog.ui
%{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg
%doc %{_mandir}/man1/gnome-session.1* %doc %{_mandir}/man1/gnome-session.1*
%doc %{_mandir}/man1/gnome-session-save.1* %doc %{_mandir}/man1/gnome-session-quit.1*
%files lang -f %{name}-2.0.lang %files lang -f %{name}-3.0.lang
%changelog %changelog