File project.diff of Package gnome-session

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package gnome-session (Revision 6c9b6ec5245d6829aaca49944497d06c)

Currently displaying revision 6c9b6ec5245d6829aaca49944497d06c , Show latest

--- gnome.orig
+++ gnome
@@ -62,15 +62,6 @@ else
  touch ~/.skel/sled10-run
 fi
 
-# Install the online help desktop icon this way until there is
-# a better solution.  The actual files reside in gnome2-SuSE
-if [ ! -e $HOME/.skel/.gnome2-run-10.3 ] ; then
-  touch $HOME/.skel/.gnome2-run-10.3
-  mkdir -p ~/Desktop
-  cp -u /usr/share/dist/desktop-files/GnomeOnlineHelp.desktop ~/Desktop
-  cp -u /usr/share/dist/desktop-files/SuSE.desktop ~/Desktop
-fi
-
 # Install the live install desktop icon this way until there is
 # a better solution.  The actual files reside in gnome2-SuSE
 # the /usr/share/applications/YaST2/live-installer.desktop exists on a live install system
--- gnome-session.spec.orig
+++ gnome-session.spec
@@ -20,6 +20,7 @@
 
 Name:           gnome-session
 BuildRequires:  PolicyKit-gnome-devel control-center2-devel fdupes
+BuildRequires:  control-center2-devel fdupes
 BuildRequires:  gnome-common gnome-desktop-devel
 BuildRequires:  gnome-keyring-devel gnome-patch-translation
 BuildRequires:  gnome-settings-daemon-devel hicolor-icon-theme intltool
@@ -34,10 +35,6 @@ Url:            http://www.gnome.org
 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
@@ -147,10 +144,6 @@ install -m644 %{S:7} $RPM_BUILD_ROOT%{_d
 %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
@@ -192,6 +185,12 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}-2.0.lang
 
 %changelog
+* Mon Sep 22 2008 - federico@novell.com
+- Removed SuSE.desktop and GnomeOnlineHelp.desktop from the sources,
+  as well as the logic in the /usr/bin/gnome script to copy these
+  files to the user's Desktop.  This is now handled in the
+  gconf2-branding-openSUSE package, as Nautilus can now handle desktop
+  items defined by the sysadmin.
 * Thu Sep 11 2008 rodrigo@suse.de
 - suse_update_desktop_file the gnome-wm.desktop file.
 - Added Hidden=true to gnome-wm.desktop file.

Places

File project.diff of Package gnome-session (Revision 6c9b6ec5245d6829aaca49944497d06c)

Places