rpms/xorg-x11-xinit/F-11 Xclients, 1.3, 1.4 xorg-x11-xinit.spec, 1.67, 1.68

[Matej Cepl]

Author: mcepl

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

Modified Files:
	Xclients xorg-x11-xinit.spec 
Log Message:
Consider scripts in /etc/X11/xinit/XClients.d as well (fix bug# 204446)


Index: Xclients
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/F-11/Xclients,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- Xclients	25 Sep 2006 17:30:37 -0000	1.3
+++ Xclients	8 Jun 2009 21:39:12 -0000	1.4
@@ -37,6 +37,12 @@ elif [ -n "$STARTKDE" ]; then
     exec "$STARTKDE"
 fi
 
+# We should also support /etc/X11/xinit/Xclients.d scripts
+XCLIENTS_D=/etc/X11/xinit/Xclients.d
+if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
+    exec -l $SHELL -c "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
+fi
+
 # Failsafe.
 
 # these files are left sitting around by TheNextLevel.


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/F-11/xorg-x11-xinit.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- xorg-x11-xinit.spec	22 May 2009 20:18:38 -0000	1.67
+++ xorg-x11-xinit.spec	8 Jun 2009 21:39:12 -0000	1.68
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   8%{?dist}
+Release:   9%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -132,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Mon Jun 08 2009 Matěj Cepl <mcepl at redhat.com> - 1.0.9-9
+- consider scripts in /etc/X11/xinit/Xclients.d/ as well
+
 * Fri May 22 2009 Nalin Dahyabhai <nalin at redhat.com> 1.0.9-8
 - have ck-xinit-session tell the session bus to set XDG_SESSION_COOKIE
   for services which it autostarts (#502258)