Accepting request 44653 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 44653 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/44653
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=94
This commit is contained in:
Vincent Untz 2010-08-06 07:52:56 +00:00 committed by Git OBS Bridge
parent 59f6d998c1
commit e113dfc3af
5 changed files with 31 additions and 47 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49c07f4f9a76fba29fae4e5a6c9542ad06de06ef25a7c469ae51d2bb7110dc82
size 817738

View File

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

View File

@ -171,7 +171,7 @@ Index: gnome-session/gsm-logout-dialog.c
{
- GsmDialogLogoutType type;
-
DkpClient *dkp_client;
UpClient *up_client;
GsmConsolekit *consolekit;
+ GtkWidget *info_label;
@ -278,7 +278,7 @@ Index: gnome-session/gsm-logout-dialog.c
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
logout_dialog->priv->dkp_client = dkp_client_new ();
logout_dialog->priv->up_client = up_client_new ();
logout_dialog->priv->consolekit = gsm_get_consolekit ();
@@ -237,40 +211,28 @@ gsm_logout_supports_shutdown (GsmLogoutD

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Aug 6 04:17:31 CEST 2010 - vuntz@opensuse.org
- Update to version 2.31.6:
+ Session Manager:
- Fix a GSeal issue
- Fixed spelling error in schema description
- Port gnome-session to upower
- Fix description of auto_save_session key
+ Drop compatibility tool that sets GTK+ 1.x environment variable
+ Drop the splash program
+ Require upower-glib instead of devkit-power-gobject
+ Add configure flag to select which GTK+ version to use
+ Updated translations.
- Change DeviceKit-power-devel BuildRequires to
libupower-glib-devel.
- Rebase gnome-session-bgo507101-tile-ui.patch.
- Drop gtk1-support and splash subpackage, and obsolete those
packages.
-------------------------------------------------------------------
Thu Jul 8 10:55:57 CEST 2010 - dimstar@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-session (Version 2.31.2)
# spec file for package gnome-session (Version 2.31.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,7 +18,7 @@
Name: gnome-session
Version: 2.31.2
Version: 2.31.6
Release: 1
License: GPLv2+
Summary: Session Tools for the GNOME 2.x Desktop
@ -39,7 +39,6 @@ Patch2: gnome-session-wm-switch.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: DeviceKit-power-devel
BuildRequires: fdupes
BuildRequires: gconf-sanity-check
BuildRequires: gconf2-devel
@ -48,6 +47,7 @@ BuildRequires: gnome-patch-translation
BuildRequires: gnome-settings-daemon-devel
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
BuildRequires: libupower-glib-devel
BuildRequires: tcpd-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
@ -64,6 +64,9 @@ Obsoletes: gnome-core
# There's no splash anymore, so no branding package.
Provides: %{name}-branding = %{version}
Obsoletes: %{name}-branding < %{version}
# Obsolete helpers that were in subpackages and that have been removed
Obsoletes: gnome-session-gtk1-support <= 2.31
Obsoletes: gnome-session-splash <= 2.31
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -84,27 +87,6 @@ This packages contain a minimal version of gnome-session, that can be used for
specific cases. The gnome-session package is needed for a fully functional
GNOME desktop.
%package gtk1-support
License: GPLv2+
Summary: GTK+ 1.x compatibility layer for gnome-session
Requires: %{name} = %{version}
Supplements: packageand(gnome-session:gtk)
%description gtk1-support
This helper makes GTK+ 1.x applications feel more integrated in
modern GNOME desktops, by setting the GTK_RC_FILES environment
variable during the GNOME session initialization.
%package splash
License: GPLv2+
Summary: Splash screen for gnome-session
Requires: %{name} = %{version}
%description splash
The splash screen is displayed to indicate that the GNOME session
is loading. It is not installed by default because the GNOME
session is considered to start fast enough.
%lang_package
%prep
%setup -q
@ -140,8 +122,6 @@ install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop
install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
%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
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
@ -176,28 +156,12 @@ rm -rf %{buildroot}
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/gnome-session
%{_bindir}/gnome-session-save
%{_libexecdir}/gnome-session
# Exclude files shipped in other subpackages
%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash
%dir %{_datadir}/gnome-session
%{_datadir}/gnome-session/gsm-inhibit-dialog.ui
%{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg
%doc %{_mandir}/man1/gnome-session.1*
%doc %{_mandir}/man1/gnome-session-save.1*
%files gtk1-support
%defattr (-, root, root)
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop
%{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
%files splash
%defattr (-, root, root)
%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop
%{_libexecdir}/gnome-session/helpers/gnome-session-splash
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash.png
%files lang -f %{name}-2.0.lang
%changelog