rpms/xorg-x11-xinit/F-11 xinit-1.0.9-unset.patch, NONE, 1.1 xorg-x11-xinit.spec, 1.64, 1.65 xinit-1.0.7-unset.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-xinit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31675

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	xinit-1.0.9-unset.patch 
Removed Files:
	xinit-1.0.7-unset.patch 
Log Message:
* Fri May 08 2009 Adam Jackson <ajax at redhat.com> 1.0.9-7
- xinit-1.0.9-unset.patch: Also unset XDG_SESSION_COOKIE in startx. (#489999)


xinit-1.0.9-unset.patch:

--- NEW FILE xinit-1.0.9-unset.patch ---
diff -up xinit-1.0.9/startx.cpp.jx xinit-1.0.9/startx.cpp
--- xinit-1.0.9/startx.cpp.jx	2008-05-21 14:29:51.000000000 -0400
+++ xinit-1.0.9/startx.cpp	2009-05-08 13:46:44.000000000 -0400
@@ -13,6 +13,7 @@ XCOMM Site administrators are STRONGLY u
 XCOMM
 XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
 
+unset XDG_SESSION_COOKIE
 unset DBUS_SESSION_BUS_ADDRESS
 unset SESSION_MANAGER
 


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/F-11/xorg-x11-xinit.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- xorg-x11-xinit.spec	11 Mar 2009 14:09:54 -0000	1.64
+++ xorg-x11-xinit.spec	8 May 2009 17:49:55 -0000	1.65
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -24,6 +24,7 @@ Source100: ck-xinit-session.c
 
 Patch1: xinit-1.0.2-client-session.patch
 Patch2: xinit-1.0.7-poke-ck.patch
+Patch3: xinit-1.0.9-unset.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libX11-devel
@@ -65,6 +66,7 @@ Allows legacy ~/.xsession and ~/.Xclient
 %setup -q -n %{pkgname}-%{version}
 %patch1 -p1 -b .client-session
 #%patch2 -p1 -b .poke-ck
+%patch3 -p1 -b .unset
 
 %build
 autoreconf
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Fri May 08 2009 Adam Jackson <ajax at redhat.com> 1.0.9-7
+- xinit-1.0.9-unset.patch: Also unset XDG_SESSION_COOKIE in startx. (#489999)
+
 * Wed Mar 11 2009 Adam Jackson <ajax at redhat.com> 1.0.9-6
 - xinitrc-common: Load /etc/X11/Xresources with -nocpp
 


--- xinit-1.0.7-unset.patch DELETED ---