rpms/sabayon/devel sabayon.spec,1.51,1.52 xephyr.patch,1.1,1.2
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Wed Apr 23 02:52:21 UTC 2008
- Previous message (by thread): rpms/sabayon/F-9 sabayon.spec,1.51,1.52 xephyr.patch,1.1,1.2
- Next message (by thread): rpms/asterisk/F-9 .cvsignore, 1.13, 1.14 asterisk.spec, 1.23, 1.24 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27603
Modified Files:
sabayon.spec xephyr.patch
Log Message:
actually apply new patch
Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sabayon.spec 23 Apr 2008 01:56:18 -0000 1.51
+++ sabayon.spec 23 Apr 2008 02:51:44 -0000 1.52
@@ -8,7 +8,7 @@
Name: sabayon
Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tool to maintain user profiles in a GNOME desktop
Group: Applications/System
@@ -20,7 +20,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Xnest crashes unless we disable the Composite extension
-Patch1: sabayon-2.12.3-xnestbug.patch
+Patch1: xephyr.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=486218
Patch3: selinux.patch
@@ -281,6 +281,9 @@
%ghost %{python_sitearch}/%{name}/lockdown/*.pyo
%changelog
+* Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
+- Actually apply the Xephyr patch
+
* Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-2
- Use Xephyr instead of Xnest
xephyr.patch:
Index: xephyr.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/xephyr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xephyr.patch 23 Apr 2008 01:56:18 -0000 1.1
+++ xephyr.patch 23 Apr 2008 02:51:44 -0000 1.2
@@ -1,12 +1,12 @@
-diff -up sabayon-2.22.0/lib/config.py.xephyr sabayon-2.22.0/lib/config.py
---- sabayon-2.22.0/lib/config.py.xephyr 2008-04-22 21:50:19.000000000 -0400
-+++ sabayon-2.22.0/lib/config.py 2008-04-22 21:51:04.000000000 -0400
+diff -up sabayon-2.22.0/lib/config.py.in.xephyr sabayon-2.22.0/lib/config.py.in
+--- sabayon-2.22.0/lib/config.py.in.xephyr 2008-03-11 16:41:44.000000000 -0400
++++ sabayon-2.22.0/lib/config.py.in 2008-04-22 22:38:48.000000000 -0400
@@ -52,7 +52,7 @@ DEFAULT_SHELL = "/bin/bash"
NOLOGIN_SHELL = "/sbin/nologin"
SKEL_HOMEDIR = "/etc/skel"
--XNEST_ARGV = [ "/usr/bin/Xnest", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
-+XNEST_ARGV = [ "/usr/bin/Xephyr", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
- SESSION_ARGV = [ "/etc/gdm/Xsession", "gnome" ]
+-XNEST_ARGV = [ "@XNEST_PATH@", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
++XNEST_ARGV = [ "/usr/bin/Xephyr", "-extension", "Composite", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
+ SESSION_ARGV = [ "@XSESSION@", "@SESSION_NAME@" ]
USERMOD_ARGV = [ "/usr/sbin/usermod" ]
- Previous message (by thread): rpms/sabayon/F-9 sabayon.spec,1.51,1.52 xephyr.patch,1.1,1.2
- Next message (by thread): rpms/asterisk/F-9 .cvsignore, 1.13, 1.14 asterisk.spec, 1.23, 1.24 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list