From 3832ea44c26e54f41982aeca0dfdcdd69185b1c0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sun, 6 Apr 2008 04:34:03 +0000
Subject: [PATCH] Drop gnome-volume-manager from the default session

---
 gnome-session.spec     | 14 ++++----------
 redhat-default-session |  5 +----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/gnome-session.spec b/gnome-session.spec
index 3738326..73feccf 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -27,10 +27,6 @@ Requires: GConf2-gtk >= %{gconf2_version}
 # Needed for gnome-settings-daemon
 Requires: control-center
 
-%ifnarch s390 s390x
-Requires: gnome-volume-manager
-%endif
-
 # pull in dbus-x11, see bug 209924
 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
 
-# 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
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
@@ -182,6 +173,9 @@ fi
 %doc %{_mandir}/man*/*
 
 %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
 - Update to 2.22.0
 
diff --git a/redhat-default-session b/redhat-default-session
index 9b34976..1e87dd9 100644
--- a/redhat-default-session
+++ b/redhat-default-session
@@ -8,7 +8,7 @@
 # The clients must be numbered from 0 to the value of num_clients - 1.
 
 [Default]
-num_clients=5
+num_clients=4
 0,id=default0
 0,Priority=60
 0,RestartCommand=pam-panel-icon --sm-client-id default0
@@ -21,6 +21,3 @@ num_clients=5
 3,id=default3
 3,Priority=40
 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