OBS User unknown 2007-09-13 22:42:59 +00:00 committed by Git OBS Bridge
parent 89aebbf02d
commit a65645077d
3 changed files with 11 additions and 6 deletions

1
gnome
View File

@ -72,6 +72,7 @@ fi
# a better solution. The actual files reside in gnome2-SuSE # a better solution. The actual files reside in gnome2-SuSE
if [ ! -e $HOME/.skel/.gnome2-run-10.3 ] ; then if [ ! -e $HOME/.skel/.gnome2-run-10.3 ] ; then
touch $HOME/.skel/.gnome2-run-10.3 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/GnomeOnlineHelp.desktop ~/Desktop
fi fi

View File

@ -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 Thu Sep 13 16:30:13 CEST 2007 - sbrabec@suse.cz

View File

@ -16,7 +16,7 @@ BuildRequires: CASA-devel control-center2-devel fdupes gnome-common gnome-deskt
License: GPL v2 or later, LGPL v2 or later License: GPL v2 or later, LGPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.19.92 Version: 2.19.92
Release: 6 Release: 7
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gnome Source1: gnome
@ -59,9 +59,9 @@ Patch13: gnome-session-no-devel-fatals.patch
Patch14: gnome-session-tile-ui.patch Patch14: gnome-session-tile-ui.patch
Patch15: gnome-session-main-init.patch Patch15: gnome-session-main-init.patch
Patch16: gnome-session-sound.patch Patch16: gnome-session-sound.patch
URL: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on AutoReqProv: on
%if %suse_version > 1000 %if %suse_version > 1000
Recommends: control-center2 Recommends: control-center2
%else %else
@ -71,7 +71,6 @@ Obsoletes: gnome-core
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Suggests: rsh Suggests: rsh
%gconf_schemas_prereq %gconf_schemas_prereq
%description %description
@ -133,14 +132,12 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
%find_lang %{name}-2.0 %find_lang %{name}-2.0
%find_gconf_schemas %find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst cat %{name}.schemas_list >%{name}.lst
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre %pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans %posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
@ -163,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang
%changelog %changelog
* Thu Sep 13 2007 - jpr@suse.de
- Ensure ~/Desktop exists before copying to it (#310363)
* Thu Sep 13 2007 - sbrabec@suse.cz * Thu Sep 13 2007 - sbrabec@suse.cz
- Fixed background resetting in /usr/bin/gnome (#309946). - Fixed background resetting in /usr/bin/gnome (#309946).
* Thu Sep 13 2007 - cgaisford@novell.com * Thu Sep 13 2007 - cgaisford@novell.com