pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=2

Browse Source
This commit is contained in:
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome
View File

@ -15,7 +15,7 @@ export KDEDIR=/opt/kde3
# #
# We use a cascaded KDE configuration while in GNOME, # We use a cascaded KDE configuration while in GNOME,
# to preconfigure some utilities better suited for 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 # Manage GTK1 themes with gnome-theme-manager
@ -45,8 +45,8 @@ function use_gnome2_default_no_settings {
[ -e $HOME/.skel/gnome2-run ] && return [ -e $HOME/.skel/gnome2-run ] && return
# run possibly available addon-scripts # run possibly available addon-scripts
if [ -d /opt/gnome/share/dist/addon-scripts ] ; then if [ -d /usr/share/dist/addon-scripts ] ; then
for scr in /opt/gnome/share/dist/addon-scripts/*; do for scr in /usr/share/dist/addon-scripts/*; do
[ -r "$scr" ] && . "$scr" [ -r "$scr" ] && . "$scr"
done done
fi fi
@ -57,10 +57,10 @@ fi
# (set help browsers to epiphany & nautilus) # (set help browsers to epiphany & nautilus)
if [ ! -d ~/.gnome ] ; then if [ ! -d ~/.gnome ] ; then
mkdir -p ~/.gnome mkdir -p ~/.gnome
cp /opt/gnome/share/dist/gnome1/* ~/.gnome/ cp /usr/share/dist/gnome1/* ~/.gnome/
fi fi
if [ ! -e ~/.gtkrc ] ; then if [ ! -e ~/.gtkrc ] ; then
cp /opt/gnome/share/dist/gnome1/gtkrc ~/.gtkrc cp /usr/share/dist/gnome1/gtkrc ~/.gtkrc
fi fi
@ -96,8 +96,8 @@ fi
# run possibly available addon-scripts # run possibly available addon-scripts
if [ -d /opt/gnome/share/dist/addon-scripts ] ; then if [ -d /usr/share/dist/addon-scripts ] ; then
for scr in /opt/gnome/share/dist/addon-scripts/*; do for scr in /usr/share/dist/addon-scripts/*; do
[ -r "$scr" ] && . "$scr" [ -r "$scr" ] && . "$scr"
done done
fi fi
@ -108,10 +108,10 @@ fi
# (set help browsers to epiphany & nautilus) # (set help browsers to epiphany & nautilus)
if [ ! -d ~/.gnome ] ; then if [ ! -d ~/.gnome ] ; then
mkdir -p ~/.gnome mkdir -p ~/.gnome
cp /opt/gnome/share/dist/gnome1/* ~/.gnome/ cp /usr/share/dist/gnome1/* ~/.gnome/
fi fi
if [ ! -e ~/.gtkrc ] ; then if [ ! -e ~/.gtkrc ] ; then
cp /opt/gnome/share/dist/gnome1/gtkrc ~/.gtkrc cp /usr/share/dist/gnome1/gtkrc ~/.gtkrc
fi 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 # 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_32=/opt/kde3/share/icons/crystalsvg/32x32
KDE_CRYSTAL_48=/opt/kde3/share/icons/crystalsvg/48x48 KDE_CRYSTAL_48=/opt/kde3/share/icons/crystalsvg/48x48
GNOME_DEFAULT_32=/opt/gnome/share/icons/gnome/32x32 GNOME_DEFAULT_32=/usr/share/icons/gnome/32x32
GNOME_DEFAULT_48=/opt/gnome/share/icons/gnome/48x48 GNOME_DEFAULT_48=/usr/share/icons/gnome/48x48
YAST_ICONS=/usr/share/YaST2/theme/current/icons/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 # start up the gnome2 session
@ -207,5 +207,4 @@ fi
exec /opt/gnome/bin/gnome-session exec /usr/bin/gnome-session

2
gnome-session-dist-splash.patch
View File

@ -5,7 +5,7 @@
<owner>gnome</owner> <owner>gnome</owner>
<type>string</type> <type>string</type>
- <default>splash/gnome-splash.png</default> - <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"> <locale name="C">
<short>Preferred Image to use for login splash screen</short> <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> <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>

6
gnome-session.changes
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 Fri Dec 22 22:42:51 CET 2006 - federico@novell.com

82
gnome-session.spec
View File

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