rpms/xorg-x11-xinit/devel Xclients, 1.1, 1.2 xorg-x11-xinit.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6214

Modified Files:
	Xclients xorg-x11-xinit.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6.fc6
- Added fix to Xclients script, based on patch from bug (#190799)



Index: Xclients
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/Xclients,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xclients	1 Nov 2005 02:00:51 -0000	1.1
+++ Xclients	19 Jul 2006 10:31:02 -0000	1.2
@@ -29,13 +29,11 @@
 # now if we can reach here, either no desktop file was present,
 # or the desktop requested is not installed.
 
-# by default, we run GNOME.
 if [ -n "$GSESSION" ]; then
+    # by default, we run GNOME.
     exec "$GSESSION"
-fi
- 
-# if GNOME isn't installed, try KDE.
-if [ -n "$STARTKDE" ]; then
+elif [ -n "$STARTKDE" ]; then
+    # if GNOME isn't installed, try KDE.
     exec "$STARTKDE"
 fi
 


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-xinit.spec	12 Jul 2006 09:22:30 -0000	1.24
+++ xorg-x11-xinit.spec	19 Jul 2006 10:31:02 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 5.1%{?dist}
+Release: 6%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -96,7 +96,10 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6.fc6
+- Added fix to Xclients script, based on patch from bug (#190799)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.2-5.1.fc6
 - rebuild
 
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5.fc6