rpms/xorg-x11/devel xorg-x11.spec,1.190,1.191

[fedora-cvs-commits at redhat.com]

Author: mharris

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

Modified Files:
	xorg-x11.spec 
Log Message:
- Added xfs.init-fc4-startearly.patch to patch xfs.init to start earlier in
  the boot process for gdm early login on FC4 builds.  This is done to the
  RPM_BUILD_ROOT installed file to ensure the changes do not get checked into
  CVS for the master initscript accidentally.




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- xorg-x11.spec	25 Apr 2005 15:28:18 -0000	1.190
+++ xorg-x11.spec	26 Apr 2005 17:16:45 -0000	1.191
@@ -21,7 +21,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 28
+Release: 29
 #Release: 1.FC3.28
 #Release: 0.%{cvs_release}.0
 
@@ -557,7 +557,9 @@
 # or X11R7
 Patch20005: XFree86-4.2.99.2-mkfontdir-perms.patch
 Patch20007: XFree86-4.3.0-redhat-xcursorgen-do-not-build-included-cursors.patch
-
+# Changes xfs.init to start at level 8 instead of level 90 during OS startup,
+# to ensure xfs is started prior to the X server and gdm
+Patch20008: xfs.init-fc4-startearly.patch
 # EXPERIMENTAL patches (disabled except for development)
 
 ######################################################################
@@ -1608,6 +1610,12 @@
 mkdir -p $RPM_BUILD_ROOT/etc/{X11/fs,rc.d/init.d}
 install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/X11/fs/config
 install -c -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
+# Patch xfs.init to start earlier for gdm early login in FC4:
+%if %{build_fc4}
+pushd $RPM_BUILD_ROOT/etc/rc.d/init.d
+patch -p0 < %{PATCH20008}
+popd
+%endif
 
 # FIXME: Can Imake do this?  Fix up symlinks
 {
@@ -3608,6 +3616,12 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Mon Apr 25 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-29
+- Added xfs.init-fc4-startearly.patch to patch xfs.init to start earlier in
+  the boot process for gdm early login on FC4 builds.  This is done to the
+  RPM_BUILD_ROOT installed file to ensure the changes do not get checked into
+  CVS for the master initscript accidentally.
+
 * Fri Apr 22 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-28
 - Added xorg-x11-6.8.2-xft-releasefile-crash.patch for fc4 builds (#155634)
 - Reordered patch section to clean up numbering inconsistencies