OBS User unknown 2007-01-08 12:58:47 +00:00 committed by Git OBS Bridge
parent 0222d4bcbc
commit fcfe1ac5b8
4 changed files with 64 additions and 57 deletions

27
gnome
View File

@ -15,7 +15,7 @@ export KDEDIR=/opt/kde3
#
# We use a cascaded KDE configuration while in GNOME,
# to preconfigure some utilities better suited for GNOME
export KDEDIRS=/opt/gnome/share/dist/kde-preconf
export KDEDIRS=/usr/share/dist/kde-preconf
#
#
# Manage GTK1 themes with gnome-theme-manager
@ -45,8 +45,8 @@ function use_gnome2_default_no_settings {
[ -e $HOME/.skel/gnome2-run ] && return
# run possibly available addon-scripts
if [ -d /opt/gnome/share/dist/addon-scripts ] ; then
for scr in /opt/gnome/share/dist/addon-scripts/*; do
if [ -d /usr/share/dist/addon-scripts ] ; then
for scr in /usr/share/dist/addon-scripts/*; do
[ -r "$scr" ] && . "$scr"
done
fi
@ -57,10 +57,10 @@ fi
# (set help browsers to epiphany & nautilus)
if [ ! -d ~/.gnome ] ; then
mkdir -p ~/.gnome
cp /opt/gnome/share/dist/gnome1/* ~/.gnome/
cp /usr/share/dist/gnome1/* ~/.gnome/
fi
if [ ! -e ~/.gtkrc ] ; then
cp /opt/gnome/share/dist/gnome1/gtkrc ~/.gtkrc
cp /usr/share/dist/gnome1/gtkrc ~/.gtkrc
fi
@ -96,8 +96,8 @@ fi
# run possibly available addon-scripts
if [ -d /opt/gnome/share/dist/addon-scripts ] ; then
for scr in /opt/gnome/share/dist/addon-scripts/*; do
if [ -d /usr/share/dist/addon-scripts ] ; then
for scr in /usr/share/dist/addon-scripts/*; do
[ -r "$scr" ] && . "$scr"
done
fi
@ -108,10 +108,10 @@ fi
# (set help browsers to epiphany & nautilus)
if [ ! -d ~/.gnome ] ; then
mkdir -p ~/.gnome
cp /opt/gnome/share/dist/gnome1/* ~/.gnome/
cp /usr/share/dist/gnome1/* ~/.gnome/
fi
if [ ! -e ~/.gtkrc ] ; then
cp /opt/gnome/share/dist/gnome1/gtkrc ~/.gtkrc
cp /usr/share/dist/gnome1/gtkrc ~/.gtkrc
fi
@ -181,11 +181,11 @@ touch ~/.skel/sled10-run
# set up an arbitrary icon path for nautilus, accessing YaST Icons and, if installed, common KDE icons
KDE_CRYSTAL_32=/opt/kde3/share/icons/crystalsvg/32x32
KDE_CRYSTAL_48=/opt/kde3/share/icons/crystalsvg/48x48
GNOME_DEFAULT_32=/opt/gnome/share/icons/gnome/32x32
GNOME_DEFAULT_48=/opt/gnome/share/icons/gnome/48x48
GNOME_DEFAULT_32=/usr/share/icons/gnome/32x32
GNOME_DEFAULT_48=/usr/share/icons/gnome/48x48
YAST_ICONS=/usr/share/YaST2/theme/current/icons/48x48
export GNOME_ICON_PATH=/usr/share/images:$YAST_ICONS/apps:$KDE_CRYSTAL_32/apps:$KDE_CRYSTAL_32/devices:$KDE_CRYSTAL_32/mimetypes:$KDE_CRYSTAL_32/filesystems:$KDE_CRYSTAL_32/actions:$KDE_CRYSTAL_48/apps:$KDE_CRYSTAL_48/devices:$KDE_CRYSTAL_48/mimetypes:$KDE_CRYSTAL_48/filesystems:$KDE_CRYSTAL_48/actions:$GNOME_DEFAULT_48/apps:$GNOME_DEFAULT_32/apps:/opt/gnome/share/pixmaps
export GNOME_ICON_PATH=/usr/share/images:$YAST_ICONS/apps:$KDE_CRYSTAL_32/apps:$KDE_CRYSTAL_32/devices:$KDE_CRYSTAL_32/mimetypes:$KDE_CRYSTAL_32/filesystems:$KDE_CRYSTAL_32/actions:$KDE_CRYSTAL_48/apps:$KDE_CRYSTAL_48/devices:$KDE_CRYSTAL_48/mimetypes:$KDE_CRYSTAL_48/filesystems:$KDE_CRYSTAL_48/actions:$GNOME_DEFAULT_48/apps:$GNOME_DEFAULT_32/apps:/usr/share/pixmaps:/opt/gnome/share/pixmaps
# start up the gnome2 session
@ -207,5 +207,4 @@ fi
exec /opt/gnome/bin/gnome-session
exec /usr/bin/gnome-session

View File

@ -5,7 +5,7 @@
<owner>gnome</owner>
<type>string</type>
- <default>splash/gnome-splash.png</default>
+ <default>/opt/gnome/share/dist/splash/dist-splash.png</default>
+ <default>/usr/share/dist/splash/dist-splash.png</default>
<locale name="C">
<short>Preferred Image to use for login splash screen</short>
<long>This is a relative path value based off the $datadir/pixmaps/ directory. Sub-directories and image names are valid values. Changing this value will effect the next session login.</long>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jan 7 23:47:51 CET 2007 - sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
-------------------------------------------------------------------
Fri Dec 22 22:42:51 CET 2006 - federico@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-session (Version 2.16.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -12,15 +12,14 @@
Name: gnome-session
BuildRequires: CASA-devel control-center2-devel gnome-common gnome-desktop-devel gnome-keyring gnome-patch-translation intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
# for xrdb resp. rsh checks:
BuildRequires: rsh xorg-x11
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
Release: 36
Release: 41
Summary: Session Tools for the GNOME 2.x Desktop
Source: gnome-session-%{version}.tar.bz2
Source: %{name}-%{version}.tar.bz2
Source1: gnome
Source2: gnome.desktop
Patch1: gnome-session-2.0.5-dithering.patch
@ -40,10 +39,16 @@ Patch27: gnome-session-migrate-session-manual.patch
Patch29: gnome-session-wm-switch.patch
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2
Autoreqprov: on
%if %suse_version > 1000
Recommends: control-center2
%else
Requires: control-center2
%endif
Obsoletes: gnome-core
%gconf_schemas_prereq
%description
This package provides the basic session tools, like session management
functionality, for the GNOME 2.x Desktop.
@ -58,7 +63,7 @@ Authors:
%prep
%setup -n gnome-session-%{version}
%setup -q
gnome-patch-translation-prepare
%patch1 -p1
%patch4
@ -81,55 +86,52 @@ gnome-patch-translation-update
%build
autoreconf -f -i
ac_cv_path_PATH_TO_XRDB=/usr/bin/xrdb \
ac_cv_path_RSH_COMMAND=/usr/bin/rsh \
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
./configure \
--prefix=%prefix \
--sysconfdir=%sysconfdir \
--mandir=%prefix/share/man \
--localstatedir=/var/lib \
# needed for gnome-session-2.16.1:
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--with-reboot-command=/sbin/reboot \
--with-halt-command=/sbin/poweroff
make
make %{?jobs:-j%jobs}
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
#
# install startup script and xsession file
install -d -m755 $RPM_BUILD_ROOT/usr/bin
install -m755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/gnome
install -d -m755 $RPM_BUILD_ROOT/usr/share/xsessions
install -m644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/xsessions/gnome.desktop
gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.?
install -d -m755 $RPM_BUILD_ROOT%{_bindir}
install -m755 %SOURCE1 $RPM_BUILD_ROOT%{_bindir}/gnome
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/xsessions
install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
%suse_update_desktop_file session-properties X-SuSE-ControlCenter-System
%find_lang %{name}-2.0
%post
export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-session.schemas >/dev/null
%find_gconf_schemas
cat %{name}-2.0.lang %{name}.schemas_list >%{name}.lst
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %files -f %{name}-2.0.lang
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%files -f %{name}.lst
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
/usr/bin/gnome
%{prefix}/bin/*
%{prefix}/share/pixmaps/*
%{prefix}/share/gnome/default.session
%{prefix}/share/gnome/default.wm
/etc/%{prefix}/gconf/schemas/gnome-session.schemas
%{prefix}/share/applications/session-properties.desktop
%doc %{prefix}/share/man/man?/*.*
/usr/share/xsessions/*.desktop
# FIXME: should be in filesystem
%dir /usr/share/xsessions
%{_bindir}/*
%{_datadir}/applications/session-properties.desktop
%{_datadir}/gnome/default.session
%{_datadir}/gnome/default.wm
%{_datadir}/pixmaps/*
# FIXME: This should be owned by X11 or filesystem:
%dir %{_datadir}/xsessions
%{_datadir}/xsessions/*.desktop
%doc %{_mandir}/man?/*.*
%changelog -n gnome-session
* Sun Jan 07 2007 - sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Fri Dec 22 2006 - federico@novell.com
- Removed the part of /usr/bin/gnome that overwrites the
/desktop/gnome/font_rendering/dpi setting in GConf upon the user's