Hello community, here is the log from the commit of package gnome-session checked in at Tue May 20 01:13:47 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-05-16 15:38:33.000000000 +0200 +++ gnome-session/gnome-session.changes 2008-05-19 17:40:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 19 17:38:53 CEST 2008 - sbrabec@suse.cz + +- Added needed desktop files and icons from gnome2-SuSE + (bnc#388735). + +------------------------------------------------------------------- New: ---- GnomeOnlineHelp.desktop SuSE.desktop suse-help.svg suse.svg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.O28762/_old 2008-05-20 01:05:16.000000000 +0200 +++ /var/tmp/diff_new_pack.O28762/_new 2008-05-20 01:05:16.000000000 +0200 @@ -16,11 +16,19 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.1.1 -Release: 32 +Release: 35 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome Source2: gnome.desktop +#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome GnomeOnlineHelp.desktop bnc388735 sbrabec@suse.cz +Source3: GnomeOnlineHelp.desktop +#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome SuSE.desktop bnc388735 sbrabec@suse.cz +Source4: SuSE.desktop +#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse-help.svg bnc388735 sbrabec@suse.cz +Source5: suse-help.svg +#PATCH-FIX-OPENSUSE Install files needed by /usr/bin/gnome suse.svg bnc388735 sbrabec@suse.cz +Source6: suse.svg #PATCH-FIX-UPSTREAM gnome-session-suspend.patch bnc73000 rodrigo@novell.com Patch0: gnome-session-suspend.patch #PATCH-FIX-OPENSUSE gnome-session-DESKTOP_LAUNCH.patch -- What was the original motivation for this? @@ -149,6 +157,14 @@ %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst %fdupes $RPM_BUILD_ROOT +# This part of code comes from gnome2-SuSE +# FIXME: Needs branding, needs upgrade process for user homedirs +mkdir -p $RPM_BUILD_ROOT/usr/share/dist/desktop-files +cp -a %{S:3} %{S:4} $RPM_BUILD_ROOT/usr/share/dist/desktop-files +# WARNING: We cannot move these icons to another location without +# providing an homedir update process: +mkdir -p $RPM_BUILD_ROOT/usr/share/dist/icons +cp -a %{S:5} %{S:6} $RPM_BUILD_ROOT/usr/share/dist/icons %clean rm -rf $RPM_BUILD_ROOT @@ -171,6 +187,7 @@ %dir %{_datadir}/xsessions %endif %doc %{_mandir}/man?/*.* +/usr/share/dist %files branding-upstream %defattr (-, root, root) @@ -179,6 +196,9 @@ %files lang -f %{name}-2.0.lang %changelog +* Mon May 19 2008 sbrabec@suse.cz +- Added needed desktop files and icons from gnome2-SuSE + (bnc#388735). * Fri May 16 2008 vuntz@suse.de - Fix a crash in gnome-session-wm-switch.patch when there's no client id in the saved session. Fix bnc#391305 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org