rpms/gnome-session
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop gnome-volume-manager from the default session

Browse Source
This commit is contained in:
Matthias Clasen 2008-04-06 04:34:03 +00:00
parent 6f808c8df5
commit 3832ea44c2
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnome-session.spec
View File

@ -12,7 +12,7 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.22.0 Version: 2.22.0
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2
Source1: redhat-default-session Source1: redhat-default-session
@ -27,10 +27,6 @@ Requires: GConf2-gtk >= %{gconf2_version}
# Needed for gnome-settings-daemon # Needed for gnome-settings-daemon
Requires: control-center Requires: control-center
%ifnarch s390 s390x
Requires: gnome-volume-manager
%endif
# pull in dbus-x11, see bug 209924 # pull in dbus-x11, see bug 209924
Requires: dbus-x11 Requires: dbus-x11
@ -132,11 +128,6 @@ install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
/bin/rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/default.session /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
# Bad evilness to remove gnome-volume-manager dependency on s390
%ifarch s390 s390x
sed -i -e 's/num_clients=7/num_clients=6/' -e '/^6,.*$/d' %{SOURCE1}
%endif
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
@ -182,6 +173,9 @@ fi
%doc %{_mandir}/man*/* %doc %{_mandir}/man*/*
%changelog %changelog
* Sun Apr 6 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-2
- Drop gnome-volume-manager from the default session
* Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1 * Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1
- Update to 2.22.0 - Update to 2.22.0

5
redhat-default-session
View File

@ -8,7 +8,7 @@
# The clients must be numbered from 0 to the value of num_clients - 1. # The clients must be numbered from 0 to the value of num_clients - 1.
[Default] [Default]
num_clients=5 num_clients=4
0,id=default0 0,id=default0
0,Priority=60 0,Priority=60
0,RestartCommand=pam-panel-icon --sm-client-id default0 0,RestartCommand=pam-panel-icon --sm-client-id default0
@ -21,6 +21,3 @@ num_clients=5
3,id=default3 3,id=default3
3,Priority=40 3,Priority=40
3,RestartCommand=nautilus --no-default-window --sm-client-id default3 3,RestartCommand=nautilus --no-default-window --sm-client-id default3
4,id=default4
4,Priority=40
4,RestartCommand=gnome-volume-manager --sm-client-id default4