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

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

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

OBS-URL: https://build.opensuse.org/request/show/30615
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=79
This commit is contained in:
Vincent Untz 2010-01-28 00:01:13 +00:00 committed by Git OBS Bridge
parent 4654cdeb3f
commit f23207d042
6 changed files with 101 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -542,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog));
@@ -367,84 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog;
@ -690,8 +690,7 @@ Index: gnome-session/gsm-logout-dialog.c
+
gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name);
- gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS);
- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label),
- primary_text);
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text);
+ gtk_window_set_title (GTK_WINDOW (logout_dialog), title);
+ gtk_window_set_position (GTK_WINDOW (logout_dialog),
+ GTK_WIN_POS_CENTER_ALWAYS);

24
gnome-session-fix-capplet-saving.patch
View File

@ -1,24 +0,0 @@
commit dd9df169196441717498ac09ee8c437fb552116e
Author: Vincent Untz <vuntz@gnome.org>
Date: Sun Oct 11 16:32:53 2009 -0400
[capplet] Destroy the main window on close to ensure changes are saved
For some reasons, sometimes it works, and sometimes it doesn't. By
destroying the window, we make sure all objects are disposed and the
changes are saved.
https://bugzilla.gnome.org/show_bug.cgi?id=597623
diff --git a/capplet/main.c b/capplet/main.c
index c8829a0..861e36a 100644
--- a/capplet/main.c
+++ b/capplet/main.c
@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog,
gtk_widget_destroy (d);
}
} else {
+ gtk_widget_destroy (GTK_WIDGET (dialog));
gtk_main_quit ();
}
}

41
gnome-session.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Jan 27 17:16:25 CET 2010 - vuntz@opensuse.org
- Update to version 2.29.6:
+ Session Manager:
- Fix typo in error message
- Add diagnostic output for exit phase timeout
- GSeal: Use accessor functions instead of direct access
- Check that the XSMP connection exists when stopping a client
to fix potential crash on exit
+ Capplet:
- Destroy the main window on close to ensure changes are saved
+ Misc:
- Install the helpers in libexecdir, not libdir
- Rebase gnome-session-bgo507101-tile-ui.patch.
- Drop gnome-session-fix-capplet-saving.patch: fixed upstream.
- Remove en@shaw translation on openSUSE 11.2 and earlier.
-------------------------------------------------------------------
Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org
- Add BuildRequires and Requires on gconf-sanity-check, which was
split from the main gconf2 package.
-------------------------------------------------------------------
Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org
- Update the way we remove the ha/ig locales for old versions of
openSUSE.
-------------------------------------------------------------------
Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org
- Split the gnome-settings-daemon helper into a gtk1-support
subpackage, that will only gets installed if gtk1 is installed.
This should remove some unneeded cruft on login for most people.
- Add --enable-splash configure option, and ship the splash screen
in a splash subpackage.
- Fix rpmlint warning about self-obsoletion.
- Fix license: it's GPLv2+ and not "GPLv2+;LGPLv2.1+".
-------------------------------------------------------------------
Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org

77
gnome-session.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-session (Version 2.28.0)
# spec file for package gnome-session (Version 2.29.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,9 +18,9 @@
Name: gnome-session
Version: 2.28.0
Release: 2
License: GPL v2 or later ; LGPL v2.1 or later
Version: 2.29.6
Release: 1
License: GPLv2+
Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org
Group: System/GUI/GNOME
@ -39,10 +39,9 @@ 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
# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream
Patch5: gnome-session-fix-capplet-saving.patch
BuildRequires: DeviceKit-power-devel
BuildRequires: fdupes
BuildRequires: gconf-sanity-check
BuildRequires: gconf2-devel
BuildRequires: gnome-common
BuildRequires: gnome-patch-translation
@ -54,6 +53,7 @@ BuildRequires: update-desktop-files
Requires: %{name}-lang = %{version}
Requires: ConsoleKit
Requires: dbus-1-x11
Requires: gconf-sanity-check
Requires: hicolor-icon-theme
# 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
@ -65,7 +65,7 @@ Requires: nautilus
Obsoletes: gnome-core
# There's no splash anymore, so no branding package.
Provides: %{name}-branding = %{version}
Obsoletes: %{name}-branding <= %{version}
Obsoletes: %{name}-branding < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@ -73,6 +73,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
This package provides the basic session tools, like session management
functionality, for the GNOME 2.x 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
@ -83,33 +104,37 @@ gnome-patch-translation-prepare
#%patch2 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p1
gnome-patch-translation-update
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--with-default-wm=gnome-wm
--with-default-wm=gnome-wm \
--enable-splash
%__make %{?jobs:-j%jobs}
%install
%makeinstall
#
%if 0%{?suse_version} <= 1110
%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/*
%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/*
%endif
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# install startup script and xsession file
install -d -m755 %{buildroot}%{_bindir}
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
%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 %{buildroot}
%clean
@ -121,24 +146,32 @@ rm -rf %{buildroot}
%preun -f %{name}.schemas_preun
%files -f %{name}.lst
%files -f %{name}.schemas_list
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_libdir}/gnome-session
%{_libexecdir}/gnome-session
%{_datadir}/gnome-session
%{_datadir}/applications/*.desktop
%{_datadir}/xsessions/*.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/icons/hicolor/*/*/*.*
%doc %{_mandir}/man?/*.*
# Exclude files shipped in other subpackages
%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash
%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
## ha/ig does not exist in Factory currently
##%if %suse_version <= 1110
# exclude locales which don't exist on old versions of openSUSE
%exclude %{_datadir}/locale/ha/LC_MESSAGES/*
%exclude %{_datadir}/locale/ig/LC_MESSAGES/*
##%endif
%changelog