rpms/gnome-session/devel gnome-session.spec, 1.154, 1.155 redhat-default-session, 1.7, 1.8
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Sun Apr 6 04:35:47 UTC 2008
- Previous message: rpms/firefox/devel .cvsignore, 1.82, 1.83 firefox.spec, 1.295, 1.296 sources, 1.94, 1.95
- Next message: rpms/gdl/devel plplot-0.9rc1-automake.patch, NONE, 1.1 gdl.spec, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129
Modified Files:
gnome-session.spec redhat-default-session
Log Message:
Drop gnome-volume-manager from the default session
Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-session.spec 11 Mar 2008 02:47:35 -0000 1.154
+++ gnome-session.spec 6 Apr 2008 04:34:03 -0000 1.155
@@ -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 @@
# 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 @@
/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 @@
%doc %{_mandir}/man*/*
%changelog
+* Sun Apr 6 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
+- Drop gnome-volume-manager from the default session
+
* Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
- Update to 2.22.0
Index: redhat-default-session
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/redhat-default-session,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- redhat-default-session 21 Mar 2007 15:35:49 -0000 1.7
+++ redhat-default-session 6 Apr 2008 04:34:03 -0000 1.8
@@ -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 @@
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
- Previous message: rpms/firefox/devel .cvsignore, 1.82, 1.83 firefox.spec, 1.295, 1.296 sources, 1.94, 1.95
- Next message: rpms/gdl/devel plplot-0.9rc1-automake.patch, NONE, 1.1 gdl.spec, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list