OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=50

.gitattributes

@@ -21,3 +21,6 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+suse-help.svg filter=lfs diff=lfs merge=lfs -text
+suse.svg filter=lfs diff=lfs merge=lfs -text

GnomeOnlineHelp.desktop

@@ -0,0 +1,23 @@
+[Desktop Entry]
+Name=Online Help
+Encoding=UTF-8
+Icon=/usr/share/dist/icons/suse-help.svg
+Type=Link
+URL=http://help.opensuse.org/
+OnlyShowIn=GNOME;
+
+X-SuSE-translate=true
+Name[cs]=Online nápověda
+Name[da]=Online hjælp
+Name[fi]=Online ohje
+Name[hu]=Online súgó
+Name[it]=Aiuto in linea
+Name[km]=ជំនួយ​លើ​បណ្ដាញ
+Name[nb]=Online-hjelp
+Name[pa]=ਆਨਲਾਇਨ ਮੱਦਦ
+Name[pl]=Pomoc online
+Name[pt]=Ajuda Online
+Name[ru]=Интерактивная помощь
+Name[sv]=Online-hjälp
+Name[uk]=Довідка
+X-SuSE-added=Name,uk;Name,sv;Name,ru;Name,pt;Name,pl;Name,pa;Name,nb;Name,km;Name,it;Name,hu;Name,fi;Name,da;Name,cs;

SuSE.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Exec=ggreeter /usr/lib/ggreeter/greeter.exe
+Name=openSUSE
+Encoding=UTF-8
+Icon=/usr/share/dist/icons/suse.svg
+OnlyShowIn=GNOME;
+

gnome-session.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 19 17:38:53 CEST 2008 - sbrabec@suse.cz
+
+- Added needed desktop files and icons from gnome2-SuSE
+  (bnc#388735).
+
 -------------------------------------------------------------------
 Fri May 16 15:43:50 CEST 2008 - vuntz@suse.de
 

gnome-session.spec

@@ -16,11 +16,19 @@ BuildRequires:  control-center2-devel fdupes gnome-common gnome-desktop-devel gn
 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 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xsessions
 %endif
 %doc %{_mandir}/man?/*.*
+/usr/share/dist
 
 %files branding-upstream
 %defattr (-, root, root)
@@ -179,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %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

suse-help.svg

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

suse.svg

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