diff --git a/gnome b/gnome index 1bf61e5..6ad8e95 100644 --- a/gnome +++ b/gnome @@ -72,6 +72,7 @@ fi # 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 fi diff --git a/gnome-session.changes b/gnome-session.changes index 26cfa8d..49a2ce5 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 13 21:41:48 CEST 2007 - jpr@suse.de + +- Ensure ~/Desktop exists before copying to it (#310363) + ------------------------------------------------------------------- Thu Sep 13 16:30:13 CEST 2007 - sbrabec@suse.cz diff --git a/gnome-session.spec b/gnome-session.spec index 9cef406..e4fd4f3 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.19.92 -Release: 6 +Release: 7 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -59,9 +59,9 @@ Patch13: gnome-session-no-devel-fatals.patch Patch14: gnome-session-tile-ui.patch Patch15: gnome-session-main-init.patch Patch16: gnome-session-sound.patch -URL: http://www.gnome.org +Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreqprov: on +AutoReqProv: on %if %suse_version > 1000 Recommends: control-center2 %else @@ -71,7 +71,6 @@ Obsoletes: gnome-core Requires: hicolor-icon-theme Requires: %{name}-lang = %{version} Suggests: rsh - %gconf_schemas_prereq %description @@ -133,14 +132,12 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-2.0 %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst - %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -163,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog +* Thu Sep 13 2007 - jpr@suse.de +- Ensure ~/Desktop exists before copying to it (#310363) * Thu Sep 13 2007 - sbrabec@suse.cz - Fixed background resetting in /usr/bin/gnome (#309946). * Thu Sep 13 2007 - cgaisford@novell.com