From a8c99eeff04b94daf18606c162a46422e309f23ea64dd4c96d245597087b4b09 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Sep 2007 13:22:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=28 --- gnome | 14 ++++++++++++++ gnome-session.changes | 9 ++++++++- gnome-session.spec | 8 ++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gnome b/gnome index bbb4f84..96a4a6d 100644 --- a/gnome +++ b/gnome @@ -83,6 +83,20 @@ fi if [ -e /etc/YaST2/live-install.xml ] ; then mkdir -p ~/Desktop cp -u /usr/share/dist/desktop-files/live-installer.desktop ~/Desktop + +# setup live install to not start beagled + if [ -e /etc/xdg/autostart/beagled-autostart.desktop ] ; then + mkdir -p ~/.config/autostart + cp /etc/xdg/autostart/beagled-autostart.desktop ~/.config/autostart + echo "X-GNOME-Autostart-enabled=false" >> ~/.config/autostart/beagled-autostart.desktop + fi + +# setup live install to not start updater-applet + if [ -e /usr/share/gnome/autostart/opensuse-updater-applet.desktop ] ; then + mkdir -p ~/.config/autostart + cp /usr/share/gnome/autostart/opensuse-updater-applet.desktop ~/.config/autostart + echo "X-GNOME-Autostart-enabled=false" >> ~/.config/autostart/opensuse-updater-applet.desktop + fi fi # Uncomment after SLED12, remove after SLED14: diff --git a/gnome-session.changes b/gnome-session.changes index e8b7144..ad931ed 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,5 +1,12 @@ ------------------------------------------------------------------- -Wed Sep 19 22:56:08 CEST 2007 - cgaisford@suse.de +Thu Sep 20 17:35:33 CEST 2007 - cgaisford@novell.com + +- Updated gnome script to detect live install user and create + desktop entires in the ~/.config/autostart directory to disable + beagle and opensuse-updater applets. Bug #326801 + +------------------------------------------------------------------- +Wed Sep 19 22:56:08 CEST 2007 - cgaisford@novell.com - Updated gnome script to create live install desktop file if the system is booted into a live install configuration. Also depends diff --git a/gnome-session.spec b/gnome-session.spec index 856b8c5..1f2c1d8 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -16,7 +16,7 @@ BuildRequires: CASA-devel control-center2-devel fdupes gnome-common gnome-deskt License: GPL v2 or later, LGPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 2 +Release: 4 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -159,7 +159,11 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog -* Wed Sep 19 2007 - cgaisford@suse.de +* Thu Sep 20 2007 - cgaisford@novell.com +- Updated gnome script to detect live install user and create + desktop entires in the ~/.config/autostart directory to disable + beagle and opensuse-updater applets. Bug #326801 +* Wed Sep 19 2007 - cgaisford@novell.com - Updated gnome script to create live install desktop file if the system is booted into a live install configuration. Also depends on an update to the gnome2-SuSE package which contains the desktop